Hello community,
here is the log from the commit of package kmediaplayer for openSUSE:Factory checked in at 2014-06-10 14:36:12
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/kmediaplayer (Old)
and /work/SRC/openSUSE:Factory/.kmediaplayer.new (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kmediaplayer"
Changes:
--------
--- /work/SRC/openSUSE:Factory/kmediaplayer/kmediaplayer.changes 2014-05-14 20:27:39.000000000 +0200
+++ /work/SRC/openSUSE:Factory/.kmediaplayer.new/kmediaplayer.changes 2014-06-10 14:36:32.000000000 +0200
@@ -1,0 +2,10 @@
+Sun Jun 1 18:02:18 UTC 2014 - hrvoje.senjan@gmail.com
+
+- Update to 4.100.0
+ * API improvements and cleanups
+ * Buildsystem fixes
+ * For more details please see:
+ http://www.kde.org/announcements/announce-frameworks5-beta3.php
+- Add baselibs.conf
+
+-------------------------------------------------------------------
Old:
----
kmediaplayer-4.99.0.tar.xz
New:
----
baselibs.conf
kmediaplayer-4.100.0.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ kmediaplayer.spec ++++++
--- /var/tmp/diff_new_pack.kXoynb/_old 2014-06-10 14:36:34.000000000 +0200
+++ /var/tmp/diff_new_pack.kXoynb/_new 2014-06-10 14:36:34.000000000 +0200
@@ -18,10 +18,10 @@
%define lname libKF5MediaPlayer5
Name: kmediaplayer
-Version: 4.99.0
+Version: 4.100.0
Release: 0
BuildRequires: cmake >= 2.8.12
-BuildRequires: extra-cmake-modules >= 0.0.13
+BuildRequires: extra-cmake-modules >= 0.0.14
BuildRequires: fdupes
BuildRequires: kbookmarks-devel >= %{_kf5_version}
BuildRequires: kcompletion-devel >= %{_kf5_version}
@@ -48,7 +48,8 @@
License: LGPL-2.1+
Group: System/GUI/KDE
Url: http://www.kde.org
-Source0: kmediaplayer-%{version}.tar.xz
+Source: http://download.kde.org/unstable/frameworks/%{version}/portingAids/%{name}-%{version}.tar.xz
+Source1: baselibs.conf
BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
++++++ baselibs.conf ++++++
libKF5MediaPlayer5
kmediaplayer-devel
requires "libKF5MediaPlayer5-<targettype> = <version>"
++++++ kmediaplayer-4.99.0.tar.xz -> kmediaplayer-4.100.0.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-4.99.0/.gitignore new/kmediaplayer-4.100.0/.gitignore
--- old/kmediaplayer-4.99.0/.gitignore 1970-01-01 01:00:00.000000000 +0100
+++ new/kmediaplayer-4.100.0/.gitignore 2014-06-01 12:41:33.000000000 +0200
@@ -0,0 +1 @@
+/apidocs/
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-4.99.0/CMakeLists.txt new/kmediaplayer-4.100.0/CMakeLists.txt
--- old/kmediaplayer-4.99.0/CMakeLists.txt 2014-05-04 21:00:30.000000000 +0200
+++ new/kmediaplayer-4.100.0/CMakeLists.txt 2014-06-01 12:41:33.000000000 +0200
@@ -6,7 +6,7 @@
#
# CMake stuff from ECM
#
-find_package(ECM 0.0.13 REQUIRED NO_MODULE)
+find_package(ECM 0.0.14 REQUIRED NO_MODULE)
set(CMAKE_MODULE_PATH ${ECM_MODULE_PATH} ${ECM_KDE_MODULE_DIR})
include(KDEInstallDirs)
@@ -19,8 +19,8 @@
include(ECMGenerateHeaders)
include(ECMPackageConfigHelpers)
-set(KF5_VERSION "4.99.0") # handled by release scripts
-set(KF5_DEP_VERSION "4.99.0") # handled by release scripts
+set(KF5_VERSION "4.100.0") # handled by release scripts
+set(KF5_DEP_VERSION "4.100.0") # handled by release scripts
#
# Version info
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-4.99.0/README.md new/kmediaplayer-4.100.0/README.md
--- old/kmediaplayer-4.99.0/README.md 2014-05-04 21:00:30.000000000 +0200
+++ new/kmediaplayer-4.100.0/README.md 2014-06-01 12:41:33.000000000 +0200
@@ -7,6 +7,10 @@
KMediaPlayer builds on the KParts framework to provide a common interface for
KParts that can play media files.
+This framework is a porting aid. It is not recommended for new projects, and
+existing projects that use it are advised to port away from it, and use plain
+KParts instead.
+
## Usage
@@ -47,5 +51,5 @@
- Home page: https://projects.kde.org/projects/frameworks/kmediaplayer
- Mailing list: https://mail.kde.org/mailman/listinfo/kde-frameworks-devel
-- IRC channel: #kde-devel on Freenode
+- IRC channel: \#kde-devel on Freenode
- Git repository: https://projects.kde.org/projects/frameworks/kmediaplayer/repository
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-4.99.0/autotests/CMakeLists.txt new/kmediaplayer-4.100.0/autotests/CMakeLists.txt
--- old/kmediaplayer-4.99.0/autotests/CMakeLists.txt 2014-05-04 21:00:30.000000000 +0200
+++ new/kmediaplayer-4.100.0/autotests/CMakeLists.txt 2014-06-01 12:41:33.000000000 +0200
@@ -1,25 +1,11 @@
find_package(Qt5Test ${REQUIRED_QT_VERSION} REQUIRED NO_MODULE)
include(ECMMarkAsTest)
+include(ECMAddTests)
-macro(KMEDIAPLAYER_EXECUTABLE_TESTS)
- foreach(_testname ${ARGN})
- add_executable(${_testname} ${_testname}.cpp)
- target_link_libraries(${_testname} KF5::MediaPlayer)
- ecm_mark_as_test(${_testname})
- endforeach()
-endmacro()
-
-macro(KMEDIAPLAYER_UNIT_TESTS)
- foreach(_testname ${ARGN})
- kmediaplayer_executable_tests(${_testname})
- target_link_libraries(${_testname} Qt5::Test)
- add_test(kmediaplayer-${_testname} ${_testname})
- ecm_mark_as_test(${_testname})
- endforeach()
-endmacro()
-
-kmediaplayer_unit_tests(
- playertest
- viewtest
+ecm_add_tests(
+ playertest.cpp
+ viewtest.cpp
+ NAME_PREFIX "kmediaplayer-"
+ LINK_LIBRARIES Qt5::Test KF5::MediaPlayer
)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-4.99.0/autotests/testplayer.h new/kmediaplayer-4.100.0/autotests/testplayer.h
--- old/kmediaplayer-4.99.0/autotests/testplayer.h 2014-05-04 21:00:30.000000000 +0200
+++ new/kmediaplayer-4.100.0/autotests/testplayer.h 2014-06-01 12:41:33.000000000 +0200
@@ -26,7 +26,7 @@
#ifndef TESTPLAYER_H
#define TESTPLAYER_H
-#include
+#include
class TestPlayer : public KMediaPlayer::Player
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-4.99.0/autotests/testview.h new/kmediaplayer-4.100.0/autotests/testview.h
--- old/kmediaplayer-4.99.0/autotests/testview.h 2014-05-04 21:00:30.000000000 +0200
+++ new/kmediaplayer-4.100.0/autotests/testview.h 2014-06-01 12:41:33.000000000 +0200
@@ -26,7 +26,7 @@
#ifndef TESTVIEW_H
#define TESTVIEW_H
-#include
+#include
class TestView : public KMediaPlayer::View
{
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-4.99.0/docs/Doxyfile.local new/kmediaplayer-4.100.0/docs/Doxyfile.local
--- old/kmediaplayer-4.99.0/docs/Doxyfile.local 1970-01-01 01:00:00.000000000 +0100
+++ new/kmediaplayer-4.100.0/docs/Doxyfile.local 2014-06-01 12:41:33.000000000 +0200
@@ -0,0 +1,2 @@
+# This file is an auto-generated file with a private header
+EXCLUDE_PATTERNS += */src/kmediaplayeradaptor.cpp
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-4.99.0/src/player.h new/kmediaplayer-4.100.0/src/player.h
--- old/kmediaplayer-4.99.0/src/player.h 2014-05-04 21:00:30.000000000 +0200
+++ new/kmediaplayer-4.100.0/src/player.h 2014-06-01 12:41:33.000000000 +0200
@@ -29,112 +29,220 @@
#include "kmediaplayer_export.h"
-/** KMediaPlayer contains an interface to reusable media player components.
-*/
+/**
+ * An interface for media playback parts.
+ */
namespace KMediaPlayer
{
-/** Player is the center of the KMediaPlayer interface. It provides all of
- * the necessary media player operations, and optionally provides the GUI to
- * control them.
+/**
+ * KPart interface to allow controlling and querying playback of a media track.
+ *
+ * This class provides methods to control playback of a single media track, as
+ * well as providing information on the current playback state. It can
+ * optionally provide access to a user interface that can be displayed to the
+ * user.
*
- * There are two servicetypes for Player: KMediaPlayer/Player and
- * KMediaPlayer/Engine. KMediaPlayer/Player provides a widget (accessable
- * through view as well as XML GUI KActions. KMediaPlayer/Engine omits
- * the user interface facets, for those who wish to provide their own
- * interface.
+ * There are two servicetypes for this KParts interface: KMediaPlayer/Player
+ * and KMediaPlayer/Engine. KMediaPlayer/Player provides a user interface (see
+ * view()), while KMediaPlayer/Engine just provides direct control via this
+ * class.
*/
class KMEDIAPLAYER_EXPORT Player : public KParts::ReadOnlyPart
{
Q_OBJECT
Q_ENUMS(State)
+ /**
+ * Whether the length property is valid.
+ *
+ * Not all media tracks have a length (for example, some streams are
+ * continuous).
+ */
Q_PROPERTY(bool hasLength READ hasLength)
+ /**
+ * The length of the media track in milliseconds.
+ *
+ * The value is undefined if hasLength is @c false.
+ */
Q_PROPERTY(qlonglong length READ length)
+ /**
+ * Whether playback should loop.
+ *
+ * As this interface has no concept of a playlist, this indicates
+ * whether the current media track will play repeatedly.
+ */
Q_PROPERTY(bool looping READ isLooping WRITE setLooping)
+ /**
+ * The position in the media track in milliseconds.
+ */
Q_PROPERTY(qlonglong position READ position)
+ /**
+ * Whether seek() can be expected to work on the current media track.
+ *
+ * Some streams cannot be seeked.
+ */
Q_PROPERTY(bool seekable READ isSeekable)
+ /**
+ * The current state of the player.
+ */
Q_PROPERTY(State state READ state WRITE setState NOTIFY stateChanged)
public:
- /** This constructor is what to use when no GUI is required, as in the
- * case of a KMediaPlayer/Engine.
+ /**
+ * Constructs a Player instance with no associated GUI.
+ *
+ * This should be used when a KMediaPlayer/Engine is requested.
*/
explicit Player(QObject *parent);
- /** This constructor is what to use when a GUI is required, as in the
- * case of a KMediaPlayer/Player.
+ /**
+ * Constructs a Player instance with a GUI.
+ *
+ * This should be used when a KMediaPlayer/Player is requested.
*/
Player(QWidget *parentWidget, const char *widgetName, QObject *parent);
+ /**
+ * Cleans up any associated resources.
+ *
+ * This should not explicitly delete any widget returned by view(): if it
+ * has been reparented, it is up to the caller to dispose of it properly.
+ */
virtual ~Player();
- /** A convenience function returning a pointer to the View for this
- * Player, or 0 if this Player has no GUI.
+ /**
+ * Returns the widget associated with this player.
+ *
+ * If the part's service type is KMediaPlayer/Player, this should not return
+ * 0. However, if the part's service is just KMediaPlayer/Engine, this may
+ * return 0.
+ *
+ * @returns A widget to view and control this Player instance, or 0 if
+ * there is no GUI.
*/
virtual View *view() = 0;
public Q_SLOTS:
- /** Pause playback of the media track.*/
+ /**
+ * Pauses playback of the media track.
+ *
+ * If the media track is not already paused, this should have no effect.
+ */
virtual void pause() = 0;
- /** Begin playing the media track.*/
+ /**
+ * Starts playing the media track.
+ *
+ * If the media track is already playing, this should have no effect.
+ */
virtual void play() = 0;
- /** Stop playback of the media track and return to the beginning.*/
+ /**
+ * Stops playback of the media track and returns it to the beginning.
+ */
virtual void stop() = 0;
- /** Move the current playback position to the specified time in
- * milliseconds, if the track is seekable. Some streams may not be
- * seeked.
+ /**
+ * Moves the current playback position.
+ *
+ * This will have no effect if isSeekable() is @c false.
+ *
+ * @param msec The new playback position in milliseconds.
*/
virtual void seek(qlonglong msec) = 0;
public:
- /** Returns whether the current track honors seek requests.*/
+ /**
+ * Returns whether seek() can be expected to work on the current media
+ * track.
+ */
virtual bool isSeekable() const = 0;
- /** Returns the current playback position in the track.*/
+ /**
+ * Returns the current playback position in milliseconds.
+ */
virtual qlonglong position() const = 0;
- /** Returns whether the current track has a length. Some streams are
- * endless, and do not have one. */
+ /**
+ * Returns whether the current media track has a length.
+ */
virtual bool hasLength() const = 0;
- /** Returns the length of the current track.*/
+ /**
+ * Returns the length of the current media track.
+ *
+ * The returned value is undefined if hasLength() returns @c false.
+ */
virtual qlonglong length() const = 0;
public Q_SLOTS:
- /** Set whether the Player should continue playing at the beginning of
- * the track when the end of the track is reached.
+ /**
+ * Sets whether playback should loop.
+ *
+ * @param on If @c true, playback will resume from the start of the
+ * track when the end is reached; if @c false it will not.
*/
void setLooping(bool on);
public:
- /** Return the current looping state. */
+ /**
+ * Returns whether playback will loop.
+ */
bool isLooping() const;
Q_SIGNALS:
- /** Emitted when the looping state is changed. */
+ /**
+ * Indicates that the value of isLooping() has changed.
+ *
+ * @param isLooping The new value.
+ */
void loopingChanged(bool isLooping);
public:
- /** The possible states of the Player */
+ /**
+ * The possible states of the player.
+ */
enum State {
- /** No track is loaded. */
+ /**
+ * No track is loaded.
+ *
+ * Most functions will not work in this state.
+ */
Empty,
- /** Not playing. */
+ /**
+ * A track is loaded, but playback is stopped.
+ *
+ * The position should always be 0 in this state. Playback will start
+ * from the beginning when play() is called.
+ */
Stop,
- /** Playing is temporarily suspended. */
+ /**
+ * Playback is temporarily suspended.
+ *
+ * Playback will resume from the current position when play() is called.
+ */
Pause,
- /** The media is currently being output. */
+ /**
+ * The media is currently being output.
+ */
Play
};
- /** Return the current state of the player. */
+ /**
+ * Returns the current state of the player.
+ */
State state() const;
Q_SIGNALS:
- /** Emitted when the state changes. */
+ /**
+ * Indicates that the value returned by state() has changed.
+ *
+ * @param newState The new value.
+ */
void stateChanged(KMediaPlayer::Player::State newState);
protected Q_SLOTS:
- /** Implementers use this to control what users see as the current
- * state.*/
+ /**
+ * Sets the current state.
+ *
+ * This allows implementors to alter the playback state. This will emit the
+ * stateChanged() signal as appropriate.
+ */
void setState(State state);
protected:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/kmediaplayer-4.99.0/src/view.h new/kmediaplayer-4.100.0/src/view.h
--- old/kmediaplayer-4.99.0/src/view.h 2014-05-04 21:00:30.000000000 +0200
+++ new/kmediaplayer-4.100.0/src/view.h 2014-06-01 12:41:33.000000000 +0200
@@ -30,63 +30,143 @@
namespace KMediaPlayer
{
-/** View is part of the user interface of a Player. */
+/**
+ * A user interface to control a Player object.
+ *
+ * Player::view() should be used to access an instance of this class.
+ */
class KMEDIAPLAYER_EXPORT View : public QWidget
{
Q_OBJECT
Q_FLAGS(Button Buttons)
+ /**
+ * The controls that are displayed by the interface.
+ */
Q_PROPERTY(Buttons buttons READ buttons WRITE setButtons NOTIFY buttonsChanged)
+ /**
+ * The widget that displays video output.
+ *
+ * This may be 0 if video output is not supported.
+ */
Q_PROPERTY(QWidget* videoWidget READ videoWidget)
public:
- /** Your typical QWidget constructor. */
+ /**
+ * Creates the user interface widget.
+ *
+ * @param parent The parent widget.
+ */
explicit View(QWidget *parent);
+ /**
+ * Destroys all related resources (but not the player object).
+ */
virtual ~View();
- /** The Possible buttons that can appear in the UI. */
+ /** The controls that can appear in the interface. */
enum Button {
- /** Button that connects to Player::play */
+ /**
+ * A control to start playback.
+ *
+ * @see Player::play()
+ */
Play = 1,
- /** Button that connects to Player::stop */
+ /**
+ * A control to stop playback.
+ *
+ * @see Player::stop()
+ */
Stop = 2,
- /** Button that connects to Player::pause */
+ /**
+ * A control to pause playback.
+ *
+ * @see Player::pause()
+ */
Pause = 4,
- /** A seeker that interfaces with Player::seek */
+ /**
+ * A control to adjust the playback position.
+ *
+ * @see Player::seek()
+ */
Seeker = 8,
- /** Show all buttons. */
+ /**
+ * All controls.
+ */
All = 255
};
Q_DECLARE_FLAGS(Buttons, Button)
- /** Return which buttons are being displayed. */
+ /**
+ * Returns which buttons are being displayed.
+ */
Buttons buttons();
- /** Return the QWidget in which video is displayed.
- May Return 0L if there is none. */
+ /**
+ * Returns the widget used to display video output.
+ *
+ * May return 0 if video output is not supported.
+ */
QWidget *videoWidget();
public Q_SLOTS:
- /** Set which buttons to display. See Button. */
- void setButtons(Buttons Buttons);
-
- /** Returns if a particular button is being displayed. */
+ /**
+ * Set the controls to display.
+ *
+ * @param buttons A ORed combination of buttons to display.
+ */
+ void setButtons(Buttons buttons);
+
+ /**
+ * Queries whether a particular control is being displayed.
+ *
+ * @param button The control to query.
+ */
bool button(Button button);
- /** Display a particular button. */
+ /**
+ * Display a control.
+ *
+ * If the control is already displayed, this has no effect. Otherwise, it
+ * will be added to the set of controls to be displayed.
+ *
+ * @param button The control to display.
+ */
void showButton(Button button);
- /** Stop displaying a particular button. */
+ /**
+ * Stop displaying a control.
+ *
+ * If the control is not already displayed, this has no effect. Otherwise,
+ * it will be removed from the set of controls to be displayed.
+ *
+ * @param button The control to stop displaying.
+ */
void hideButton(Button button);
- /** Toggle the display of a particular button. */
+ /**
+ * Toggle the display of a control.
+ *
+ * If the control is not already displayed, it will be added to the set of
+ * controls to be displayed. Otherwise, it will be removed from that set.
+ *
+ * @param button The control to toggle.
+ */
void toggleButton(Button button);
Q_SIGNALS:
- /** Emitted when the set of displayed buttons changes. */
+ /**
+ * Indicates that the value returned by buttons() has changed.
+ *
+ * Subclasses should connect to this signal to update the set of controls
+ * they display.
+ *
+ * @param buttons The new value.
+ */
void buttonsChanged(KMediaPlayer::View::Buttons buttons);
protected:
- /** The implementing view should set the widget in which
- the video will be displayed. KMediaPlayer users may
- reparent() it to somewhere else, for example.
- */
+ /**
+ * Set the widget used to display video output.
+ *
+ * This should normally be created with this object as the parent, but users
+ * of this object may use QWidget::setParent(QWidget*) to move it elsewhere.
+ */
void setVideoWidget(QWidget *videoWidget);
private:
--
To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org
For additional commands, e-mail: opensuse-commit+help@opensuse.org