| mediaobject.h | mediaobject.h | |||
|---|---|---|---|---|
| skipping to change at line 444 | skipping to change at line 444 | |||
| * | * | |||
| * \par Possible states right after this call: | * \par Possible states right after this call: | |||
| * \li BufferingState | * \li BufferingState | |||
| * \li PlayingState | * \li PlayingState | |||
| * \li ErrorState | * \li ErrorState | |||
| */ | */ | |||
| void play(); | void play(); | |||
| /** | /** | |||
| * Requests playback to pause. If it was paused before nothing changes. | * Requests playback to pause. If it was paused before nothing changes. | |||
| * If the media cannot be paused, some backends will internally | ||||
| call | ||||
| * stop instead of pause. | ||||
| * | * | |||
| * \par Possible states right after this call: | * \par Possible states right after this call: | |||
| * \li PlayingState | * \li PlayingState | |||
| * \li PausedState | * \li PausedState | |||
| * \li StoppedState | ||||
| * \li ErrorState | * \li ErrorState | |||
| */ | */ | |||
| void pause(); | void pause(); | |||
| /** | /** | |||
| * Requests playback to stop. If it was stopped before nothing changes. | * Requests playback to stop. If it was stopped before nothing changes. | |||
| * | * | |||
| * \par Possible states right after this call: | * \par Possible states right after this call: | |||
| * \li the state it was in before (e.g. PlayingState) | * \li the state it was in before (e.g. PlayingState) | |||
| * \li StoppedState | * \li StoppedState | |||
| End of changes. 2 change blocks. | ||||
| 0 lines changed or deleted | 4 lines changed or added | |||
| phononnamespace.h | phononnamespace.h | |||
|---|---|---|---|---|
| skipping to change at line 39 | skipping to change at line 39 | |||
| * Helper macro that can be used like | * Helper macro that can be used like | |||
| * \code | * \code | |||
| * #if (PHONON_VERSION >= PHONON_VERSION_CHECK(4, 4, 0)) | * #if (PHONON_VERSION >= PHONON_VERSION_CHECK(4, 4, 0)) | |||
| * \endcode | * \endcode | |||
| */ | */ | |||
| #define PHONON_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|( patch)) | #define PHONON_VERSION_CHECK(major, minor, patch) ((major<<16)|(minor<<8)|( patch)) | |||
| /** | /** | |||
| * PHONON_VERSION is (major << 16) + (minor << 8) + patch. | * PHONON_VERSION is (major << 16) + (minor << 8) + patch. | |||
| */ | */ | |||
| #define PHONON_VERSION PHONON_VERSION_CHECK(4, 7, 2) | #define PHONON_VERSION PHONON_VERSION_CHECK(4, 8, 0) | |||
| /** | /** | |||
| * PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1" | * PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1" | |||
| */ | */ | |||
| #define PHONON_VERSION_STR "4.7.2" | #define PHONON_VERSION_STR "4.8.0" | |||
| /** | /** | |||
| * Definitions to disable capture - should end up in the backends and | * Definitions to disable capture - should end up in the backends and | |||
| * platform plugins, too | * platform plugins, too | |||
| */ | */ | |||
| /* #undef PHONON_NO_CAPTURE */ | /* #undef PHONON_NO_CAPTURE */ | |||
| #ifdef PHONON_NO_CAPTURE | #ifdef PHONON_NO_CAPTURE | |||
| #define PHONON_NO_VIDEOCAPTURE | #define PHONON_NO_VIDEOCAPTURE | |||
| #define PHONON_NO_AUDIOCAPTURE | #define PHONON_NO_AUDIOCAPTURE | |||
| #endif | #endif | |||
| End of changes. 2 change blocks. | ||||
| 2 lines changed or deleted | 2 lines changed or added | |||
| pulsesupport.h | pulsesupport.h | |||
|---|---|---|---|---|
| skipping to change at line 40 | skipping to change at line 40 | |||
| #include <QtCore/QtGlobal> | #include <QtCore/QtGlobal> | |||
| #include <QtCore/QSet> | #include <QtCore/QSet> | |||
| namespace Phonon | namespace Phonon | |||
| { | { | |||
| class PulseStream; | class PulseStream; | |||
| class PHONON_EXPORT PulseSupport : public QObject | class PHONON_EXPORT PulseSupport : public QObject | |||
| { | { | |||
| Q_OBJECT | Q_OBJECT | |||
| public: | public: | |||
| static PulseSupport* getInstance(); | /** | |||
| * \returns the instance pointer or null, see note. | ||||
| * \note If \param allowNull is \c true and the instance was al | ||||
| ready | ||||
| * shut down this function instead returns to indicate th | ||||
| at | ||||
| * the instance was already shut down. | ||||
| * If \param allowNull is \c false and the instance was a | ||||
| lready | ||||
| * shut down a dummy instance is returned instead. This c | ||||
| ase | ||||
| * will furthermore result in a qWarning being printed, s | ||||
| o | ||||
| * when possible and sensible null handling should be don | ||||
| e | ||||
| * to prevent this. | ||||
| */ | ||||
| static PulseSupport *getInstanceOrNull(bool allowNull = false); | ||||
| /** This function behaves like getInstanceOrNull(false). \see g | ||||
| etInstanceOrNull */ | ||||
| static PulseSupport *getInstance(); | ||||
| static void shutdown(); | static void shutdown(); | |||
| bool isActive(); | bool isActive(); | |||
| void enable(bool enabled = true); | void enable(bool enabled = true); | |||
| QList<int> objectDescriptionIndexes(ObjectDescriptionType type) const; | QList<int> objectDescriptionIndexes(ObjectDescriptionType type) const; | |||
| QHash<QByteArray, QVariant> objectDescriptionProperties(ObjectD escriptionType type, int index) const; | QHash<QByteArray, QVariant> objectDescriptionProperties(ObjectD escriptionType type, int index) const; | |||
| QList<int> objectIndexesByCategory(ObjectDescriptionType type, Category category) const; | QList<int> objectIndexesByCategory(ObjectDescriptionType type, Category category) const; | |||
| QList<int> objectIndexesByCategory(ObjectDescriptionType type, CaptureCategory category) const; | QList<int> objectIndexesByCategory(ObjectDescriptionType type, CaptureCategory category) const; | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 21 lines changed or added | |||