| mediasource.h | mediasource.h | |||
|---|---|---|---|---|
| skipping to change at line 64 | skipping to change at line 64 | |||
| * m.setCurrentSource(Phonon::Cd); | * m.setCurrentSource(Phonon::Cd); | |||
| * \endcode | * \endcode | |||
| * | * | |||
| * \ingroup Playback | * \ingroup Playback | |||
| * \ingroup Recording | * \ingroup Recording | |||
| * \author Matthias Kretz <kretz@kde.org> | * \author Matthias Kretz <kretz@kde.org> | |||
| */ | */ | |||
| class PHONON_EXPORT MediaSource | class PHONON_EXPORT MediaSource | |||
| { | { | |||
| friend class StreamInterface; | friend class StreamInterface; | |||
| friend QDebug operator <<(QDebug dbg, const Phonon::MediaSource &); | friend PHONON_EXPORT QDebug operator <<(QDebug dbg, const Phonon::Media Source &); | |||
| public: | public: | |||
| /** | /** | |||
| * Identifies the type of media described by the MediaSource object . | * Identifies the type of media described by the MediaSource object . | |||
| * | * | |||
| * \see MediaSource::type() | * \see MediaSource::type() | |||
| */ | */ | |||
| enum Type { | enum Type { | |||
| /** | /** | |||
| * The MediaSource object does not describe any valid source. | * The MediaSource object does not describe any valid source. | |||
| */ | */ | |||
| End of changes. 1 change blocks. | ||||
| 1 lines changed or deleted | 1 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, 0) | #define PHONON_VERSION PHONON_VERSION_CHECK(4, 7, 1) | |||
| /** | /** | |||
| * 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.0" | #define PHONON_VERSION_STR "4.7.1" | |||
| /** | /** | |||
| * 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 | |||