abstractaudiooutput.h   abstractaudiooutput.h 
skipping to change at line 37 skipping to change at line 37
#include "medianode.h" #include "medianode.h"
#include <QtCore/QObject> #include <QtCore/QObject>
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Phonon namespace Phonon
{ {
class AbstractAudioOutputPrivate; class AbstractAudioOutputPrivate;
/** \class AbstractAudioOutput abstractaudiooutput.h Phonon/AbstractAud ioOutput /** \class AbstractAudioOutput abstractaudiooutput.h phonon/AbstractAud ioOutput
* Common base class for all audio outputs. * Common base class for all audio outputs.
* *
* \see AudioOutput * \see AudioOutput
*/ */
class PHONON_EXPORT AbstractAudioOutput : public QObject, public MediaN ode class PHONON_EXPORT AbstractAudioOutput : public QObject, public MediaN ode
{ {
Q_OBJECT Q_OBJECT
K_DECLARE_PRIVATE(AbstractAudioOutput) K_DECLARE_PRIVATE(AbstractAudioOutput)
protected: protected:
AbstractAudioOutput(AbstractAudioOutputPrivate &dd, QObject *parent ); AbstractAudioOutput(AbstractAudioOutputPrivate &dd, QObject *parent );
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 abstractmediastream.h   abstractmediastream.h 
skipping to change at line 42 skipping to change at line 42
class QByteArray; class QByteArray;
#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM #ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
namespace Phonon namespace Phonon
{ {
class MediaObject; class MediaObject;
class AbstractMediaStreamPrivate; class AbstractMediaStreamPrivate;
/** \class AbstractMediaStream abstractmediastream.h Phonon/AbstractMediaSt ream /** \class AbstractMediaStream abstractmediastream.h phonon/AbstractMediaSt ream
* \brief Base class for custom media data streams. * \brief Base class for custom media data streams.
* *
* Implement this class to provide a custom data stream to the backend. The class supports both, the * Implement this class to provide a custom data stream to the backend. The class supports both, the
* push and the pull model. * push and the pull model.
* *
* Push: * Push:
* \code * \code
* PushStream::PushStream(QObject *parent) * PushStream::PushStream(QObject *parent)
* : AbstractMediaStream(parent), m_timer(new QTimer(this)) * : AbstractMediaStream(parent), m_timer(new QTimer(this))
* { * {
skipping to change at line 217 skipping to change at line 217
* Reimplement this function if your stream is seekable. * Reimplement this function if your stream is seekable.
* *
* When this function is called the next call to writeData has to b e at the requested \p * When this function is called the next call to writeData has to b e at the requested \p
* offset. * offset.
* *
* \warning Do not call the parent implementation. * \warning Do not call the parent implementation.
*/ */
virtual void seekStream(qint64 offset); virtual void seekStream(qint64 offset);
AbstractMediaStream(AbstractMediaStreamPrivate &dd, QObject *parent ); AbstractMediaStream(AbstractMediaStreamPrivate &dd, QObject *parent );
AbstractMediaStreamPrivate *d_ptr; QScopedPointer<AbstractMediaStreamPrivate> d_ptr;
}; };
} // namespace Phonon } // namespace Phonon
#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM #endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER
#endif // PHONON_ABSTRACTMEDIASTREAM_H #endif // PHONON_ABSTRACTMEDIASTREAM_H
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 abstractvideooutput.h   abstractvideooutput.h 
skipping to change at line 48 skipping to change at line 48
{ {
namespace Experimental namespace Experimental
{ {
class Visualization; class Visualization;
class VisualizationPrivate; class VisualizationPrivate;
} // namespace Experimental } // namespace Experimental
class AbstractVideoOutputPrivate; class AbstractVideoOutputPrivate;
/** \class AbstractVideoOutput abstractvideooutput.h Phonon/AbstractVid eoOutput /** \class AbstractVideoOutput abstractvideooutput.h phonon/AbstractVid eoOutput
* \brief Common base class for all video outputs. * \brief Common base class for all video outputs.
* *
* \see VideoWidget * \see VideoWidget
*/ */
class PHONON_EXPORT AbstractVideoOutput : public MediaNode class PHONON_EXPORT AbstractVideoOutput : public MediaNode
{ {
friend class Experimental::Visualization; friend class Experimental::Visualization;
friend class Experimental::VisualizationPrivate; friend class Experimental::VisualizationPrivate;
K_DECLARE_PRIVATE(AbstractVideoOutput) K_DECLARE_PRIVATE(AbstractVideoOutput)
protected: protected:
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 addoninterface.h   addoninterface.h 
skipping to change at line 38 skipping to change at line 38
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QVariant> #include <QtCore/QVariant>
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_PHONON_MEDIACONTROLLER #ifndef QT_NO_PHONON_MEDIACONTROLLER
namespace Phonon namespace Phonon
{ {
/** \class AddonInterface addoninterface.h Phonon/AddonInterface /** \class AddonInterface addoninterface.h phonon/AddonInterface
* \short Interface for Menu, Chapter, Angle and Title/Track control. * \short Interface for Menu, Chapter, Angle and Title/Track control.
* *
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class AddonInterface class AddonInterface
{ {
public: public:
virtual ~AddonInterface() {} virtual ~AddonInterface() {}
enum Interface { enum Interface {
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 audiodataoutput.h   audiodataoutput.h 
skipping to change at line 29 skipping to change at line 29
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
*/ */
#ifndef Phonon_AUDIODATAOUTPUT_H #ifndef Phonon_AUDIODATAOUTPUT_H
#define Phonon_AUDIODATAOUTPUT_H #define Phonon_AUDIODATAOUTPUT_H
#include "phonon_export.h" #include "phonon_export.h"
#include "abstractaudiooutput.h" #include "abstractaudiooutput.h"
#include "phonondefs.h" #include "phonondefs.h"
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
#ifndef DOXYGEN_SHOULD_SKIP_THIS #ifndef DOXYGEN_SHOULD_SKIP_THIS
template<typename T> class QVector; template<typename T> class QVector;
template<typename Key, typename T> class QMap; template<typename Key, typename T> class QMap;
#endif #endif
namespace Phonon namespace Phonon
{ {
class AudioDataOutputPrivate; class AudioDataOutputPrivate;
/** /**
skipping to change at line 127 skipping to change at line 130
* before dataReady with \p remainingSamples = 28. * before dataReady with \p remainingSamples = 28.
* *
* \param remainingSamples The number of samples in the next * \param remainingSamples The number of samples in the next
* dataReady vector that belong to the media that was playing t o * dataReady vector that belong to the media that was playing t o
* this point. * this point.
*/ */
void endOfMedia(int remainingSamples); void endOfMedia(int remainingSamples);
}; };
} // namespace Phonon } // namespace Phonon
QT_END_NAMESPACE
QT_END_HEADER
// vim: sw=4 ts=4 tw=80 // vim: sw=4 ts=4 tw=80
#endif // Phonon_AUDIODATAOUTPUT_H #endif // Phonon_AUDIODATAOUTPUT_H
 End of changes. 2 change blocks. 
0 lines changed or deleted 6 lines changed or added


 audiodataoutputinterface.h   audiodataoutputinterface.h 
skipping to change at line 26 skipping to change at line 26
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
*/ */
#ifndef PHONON_AUDIODATAOUTPUTINTERFACE_H #ifndef PHONON_AUDIODATAOUTPUTINTERFACE_H
#define PHONON_AUDIODATAOUTPUTINTERFACE_H #define PHONON_AUDIODATAOUTPUTINTERFACE_H
QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE
namespace Phonon namespace Phonon
{ {
class AudioDataOutput; class AudioDataOutput;
class AudioDataOutputInterface class AudioDataOutputInterface
{ {
public: public:
virtual ~AudioDataOutputInterface() {} virtual ~AudioDataOutputInterface() {}
virtual AudioDataOutput *frontendObject() const = 0; virtual AudioDataOutput *frontendObject() const = 0;
virtual void setFrontendObject(AudioDataOutput *) = 0; virtual void setFrontendObject(AudioDataOutput *) = 0;
}; };
} // namespace Phonon } // namespace Phonon
Q_DECLARE_INTERFACE(Phonon::AudioDataOutputInterface, "0AudioDataOutputInte rface.phonon.kde.org") Q_DECLARE_INTERFACE(Phonon::AudioDataOutputInterface, "0AudioDataOutputInte rface.phonon.kde.org")
QT_END_NAMESPACE
QT_END_HEADER
#endif // PHONON_AUDIODATAOUTPUTINTERFACE_H #endif // PHONON_AUDIODATAOUTPUTINTERFACE_H
 End of changes. 2 change blocks. 
0 lines changed or deleted 6 lines changed or added


 audiooutput.h   audiooutput.h 
skipping to change at line 41 skipping to change at line 41
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QString; class QString;
class AudioOutputAdaptor; class AudioOutputAdaptor;
namespace Phonon namespace Phonon
{ {
class AudioOutputPrivate; class AudioOutputPrivate;
/** \class AudioOutput audiooutput.h Phonon/AudioOutput /** \class AudioOutput audiooutput.h phonon/AudioOutput
* \short Class for audio output to the soundcard. * \short Class for audio output to the soundcard.
* *
* Use this class to define the audio output. * Use this class to define the audio output.
* *
* \ingroup Frontend * \ingroup Frontend
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
* \see Phonon::Ui::VolumeSlider * \see Phonon::Ui::VolumeSlider
*/ */
class PHONON_EXPORT AudioOutput : public AbstractAudioOutput class PHONON_EXPORT AudioOutput : public AbstractAudioOutput
{ {
skipping to change at line 169 skipping to change at line 169
* *
* The change can happen either through setOutputDevice or if t he * The change can happen either through setOutputDevice or if t he
* global configuration for the used category has changed. * global configuration for the used category has changed.
* *
* \see outputDevice * \see outputDevice
*/ */
void outputDeviceChanged(const Phonon::AudioOutputDevice &newAu dioOutputDevice); void outputDeviceChanged(const Phonon::AudioOutputDevice &newAu dioOutputDevice);
private: private:
Q_PRIVATE_SLOT(k_func(), void _k_volumeChanged(qreal)) Q_PRIVATE_SLOT(k_func(), void _k_volumeChanged(qreal))
Q_PRIVATE_SLOT(k_func(), void _k_mutedChanged(bool))
Q_PRIVATE_SLOT(k_func(), void _k_revertFallback()) Q_PRIVATE_SLOT(k_func(), void _k_revertFallback())
Q_PRIVATE_SLOT(k_func(), void _k_audioDeviceFailed()) Q_PRIVATE_SLOT(k_func(), void _k_audioDeviceFailed())
Q_PRIVATE_SLOT(k_func(), void _k_deviceListChanged()) Q_PRIVATE_SLOT(k_func(), void _k_deviceListChanged())
Q_PRIVATE_SLOT(k_func(), void _k_deviceChanged(int device))
}; };
} //namespace Phonon } //namespace Phonon
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER
// vim: sw=4 ts=4 tw=80 // vim: sw=4 ts=4 tw=80
#endif // Phonon_AUDIOOUTPUT_H #endif // Phonon_AUDIOOUTPUT_H
 End of changes. 3 change blocks. 
1 lines changed or deleted 3 lines changed or added


 audiooutputinterface.h   audiooutputinterface.h 
skipping to change at line 36 skipping to change at line 36
#include "phononnamespace.h" #include "phononnamespace.h"
#include "objectdescription.h" #include "objectdescription.h"
#include "phonondefs.h" #include "phonondefs.h"
#include <QtCore/QtGlobal> #include <QtCore/QtGlobal>
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Phonon namespace Phonon
{ {
/** \class AudioOutputInterface audiooutputinterface.h Phonon/AudioOutputIn terface /** \class AudioOutputInterface audiooutputinterface.h phonon/AudioOutputIn terface
* \short Interface for AudioOutput objects * \short Interface for AudioOutput objects
* *
* The implementation can make use of the signals * The implementation can make use of the signals
* \code * \code
void volumeChanged(qreal newVolume); void volumeChanged(qreal newVolume);
void audioDeviceFailed(); void audioDeviceFailed();
* \endcode * \endcode
* to notify the frontend whenever the volume has changed or when an audioD eviceFailed (e.g. USB * to notify the frontend whenever the volume has changed or when an audioD eviceFailed (e.g. USB
* unplug or sound server failure). * unplug or sound server failure).
* *
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 backendcapabilities.h   backendcapabilities.h 
skipping to change at line 54 skipping to change at line 54
{ {
/** /**
* Collection of functions describing the capabilities of the Backend. * Collection of functions describing the capabilities of the Backend.
* *
* \ingroup BackendInformation * \ingroup BackendInformation
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
namespace BackendCapabilities namespace BackendCapabilities
{ {
/** \class Notifier backendcapabilities.h Phonon/BackendCapabilities /** \class Notifier backendcapabilities.h phonon/BackendCapabilities
* Notifications about backend capabilities. * Notifications about backend capabilities.
* *
* \ingroup BackendInformation * \ingroup BackendInformation
*/ */
class Notifier : public QObject class Notifier : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_SIGNALS: Q_SIGNALS:
/** /**
* This signal is emitted if the capabilities have changed. Thi s can * This signal is emitted if the capabilities have changed. Thi s can
skipping to change at line 91 skipping to change at line 91
* *
* Check BackendCapabilities::availableAudioCaptureDevices to g et the * Check BackendCapabilities::availableAudioCaptureDevices to g et the
* current list of available devices. * current list of available devices.
*/ */
#ifndef QT_NO_PHONON_AUDIOCAPTURE #ifndef QT_NO_PHONON_AUDIOCAPTURE
void availableAudioCaptureDevicesChanged(); void availableAudioCaptureDevicesChanged();
#endif //QT_NO_PHONON_AUDIOCAPTURE #endif //QT_NO_PHONON_AUDIOCAPTURE
}; };
/** /**
* Use this function to get a QObject pointer to connect to the capabil itiesChanged signal. * Use this function to get a QObject pointer to connect to one of the Notifier signals.
* *
* \return a pointer to a QObject. * \return a pointer to a QObject.
* *
* The capabilitiesChanged signal is emitted if the capabilities have c * To connect to the signal do the following:
hanged. This can
* happen if the user has requested a backend change.
*
* To connect to this signal do the following:
* \code * \code
* QObject::connect(BackendCapabilities::notifier(), SIGNAL(capabilitie sChanged()), ... * QObject::connect(BackendCapabilities::notifier(), SIGNAL(capabilitie sChanged()), ...
* \endcode * \endcode
* *
* \see Notifier::capabilitiesChanged() * \see Notifier::capabilitiesChanged()
* \see Notifier::availableAudioOutputDevicesChanged()
* \see Notifier::availableAudioCaptureDevicesChanged()
*/ */
PHONON_EXPORT Notifier *notifier(); PHONON_EXPORT Notifier *notifier();
/** /**
* Returns a list of mime types that the Backend can decode. * Returns a list of mime types that the Backend can decode.
* *
* \see isMimeTypeAvailable() * \see isMimeTypeAvailable()
*/ */
PHONON_EXPORT QStringList availableMimeTypes(); PHONON_EXPORT QStringList availableMimeTypes();
 End of changes. 4 change blocks. 
7 lines changed or deleted 5 lines changed or added


 backendinterface.h   backendinterface.h 
skipping to change at line 40 skipping to change at line 40
#include <QtCore/QSet> #include <QtCore/QSet>
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
class QVariant; class QVariant;
namespace Phonon namespace Phonon
{ {
/** \class BackendInterface backendinterface.h Phonon/BackendInterface /** \class BackendInterface backendinterface.h phonon/BackendInterface
* \short Main Backend class interface * \short Main Backend class interface
* *
* This interface defines the main factory of the backend. The createObject function creates all the * This interface defines the main factory of the backend. The createObject function creates all the
* objects needed by the frontend. * objects needed by the frontend.
* *
* The objectDescriptionIndexes and objectDescriptionProperties functions r eturn information about * The objectDescriptionIndexes and objectDescriptionProperties functions r eturn information about
* available devices, effects and codecs. * available devices, effects and codecs.
* *
* An implementation could look like this: * An implementation could look like this:
* \code * \code
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 effect.h   effect.h 
skipping to change at line 44 skipping to change at line 44
#ifndef QT_NO_PHONON_EFFECT #ifndef QT_NO_PHONON_EFFECT
class QString; class QString;
template<class T> class QList; template<class T> class QList;
namespace Phonon namespace Phonon
{ {
class EffectParameter; class EffectParameter;
class EffectPrivate; class EffectPrivate;
/** \class Effect effect.h Phonon/Effect /** \class Effect effect.h phonon/Effect
* \short Effects that can be inserted into a Path. * \short Effects that can be inserted into a Path.
* An effect is a special object which can perform * An effect is a special object which can perform
* transformations on the specified path. Examples may include simple * transformations on the specified path. Examples may include simple
* modifiers such as fading or pitch shifting, or more complex mathemat ical * modifiers such as fading or pitch shifting, or more complex mathemat ical
* transformations. * transformations.
* *
* In order to use an effect, insert it into the path as follows: * In order to use an effect, insert it into the path as follows:
* \code * \code
* Path path = Phonon::createPath(...); * Path path = Phonon::createPath(...);
* Effect *effect = new Effect(this); * Effect *effect = new Effect(this);
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 effectinterface.h   effectinterface.h 
skipping to change at line 37 skipping to change at line 37
#include <QtCore/QVariant> #include <QtCore/QVariant>
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_PHONON_EFFECT #ifndef QT_NO_PHONON_EFFECT
namespace Phonon namespace Phonon
{ {
class EffectParameter; class EffectParameter;
/** \class EffectInterface effectinterface.h Phonon/EffectInterface /** \class EffectInterface effectinterface.h phonon/EffectInterface
* \short Interface for Effect objects * \short Interface for Effect objects
* *
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class EffectInterface class EffectInterface
{ {
public: public:
virtual ~EffectInterface() {} virtual ~EffectInterface() {}
/** /**
* Returns the EffectParameter objects to describe the paramete rs of this effect. * Returns the EffectParameter objects to describe the paramete rs of this effect.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 effectparameter.h   effectparameter.h 
skipping to change at line 42 skipping to change at line 42
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_PHONON_EFFECT #ifndef QT_NO_PHONON_EFFECT
namespace Phonon namespace Phonon
{ {
class Effect; class Effect;
class EffectParameterPrivate; class EffectParameterPrivate;
/** \class EffectParameter effectparameter.h Phonon/EffectParameter /** \class EffectParameter effectparameter.h phonon/EffectParameter
* \brief This class describes one parameter of an effect. * \brief This class describes one parameter of an effect.
* *
* \ingroup PhononEffects * \ingroup PhononEffects
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
* \see Effect * \see Effect
*/ */
class PHONON_EXPORT EffectParameter class PHONON_EXPORT EffectParameter
{ {
friend class BrightnessControl; friend class BrightnessControl;
public: public:
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 effectwidget.h   effectwidget.h 
skipping to change at line 41 skipping to change at line 41
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_PHONON_EFFECTWIDGET #ifndef QT_NO_PHONON_EFFECTWIDGET
namespace Phonon namespace Phonon
{ {
class Effect; class Effect;
class EffectWidgetPrivate; class EffectWidgetPrivate;
/** \class EffectWidget effectwidget.h Phonon/EffectWidget /** \class EffectWidget effectwidget.h phonon/EffectWidget
* \brief Widget to control the parameters of an Effect. * \brief Widget to control the parameters of an Effect.
* *
* \ingroup PhononWidgets * \ingroup PhononWidgets
* \ingroup PhononEffects * \ingroup PhononEffects
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class PHONON_EXPORT EffectWidget : public QWidget class PHONON_EXPORT EffectWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
K_DECLARE_PRIVATE(EffectWidget) K_DECLARE_PRIVATE(EffectWidget)
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mediacontroller.h   mediacontroller.h 
skipping to change at line 42 skipping to change at line 42
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_PHONON_MEDIACONTROLLER #ifndef QT_NO_PHONON_MEDIACONTROLLER
namespace Phonon namespace Phonon
{ {
class MediaControllerPrivate; class MediaControllerPrivate;
class MediaObject; class MediaObject;
/** \class MediaController mediacontroller.h Phonon/MediaController /** \class MediaController mediacontroller.h phonon/MediaController
* \brief Controls optional features of a media file/device like title, cha pter, angle. * \brief Controls optional features of a media file/device like title, cha pter, angle.
* *
* \ingroup Playback * \ingroup Playback
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class PHONON_EXPORT MediaController : public QObject class PHONON_EXPORT MediaController : public QObject
{ {
Q_OBJECT Q_OBJECT
Q_FLAGS(Features) Q_FLAGS(Features)
public: public:
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 mediaobject.h   mediaobject.h 
skipping to change at line 38 skipping to change at line 38
#include "phonondefs.h" #include "phonondefs.h"
#include "phononnamespace.h" #include "phononnamespace.h"
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Phonon namespace Phonon
{ {
class MediaObjectPrivate; class MediaObjectPrivate;
/** \class MediaObject mediaobject.h Phonon/MediaObject /** \class MediaObject mediaobject.h phonon/MediaObject
* \short Interface for media playback of a given URL. * \short Interface for media playback of a given URL.
* *
* This class is the most important class in %Phonon. Use it to open a media * This class is the most important class in %Phonon. Use it to open a media
* file at an arbitrary location, a CD or DVD or to stream media data f rom * file at an arbitrary location, a CD or DVD or to stream media data f rom
* the application to the backend. * the application to the backend.
* *
* This class controls the state (play, pause, stop, seek) * This class controls the state (play, pause, stop, seek)
* and you can use it to get a lot of information about the media data. * and you can use it to get a lot of information about the media data.
* *
* Notice that most functions of this class are asynchronous. * Notice that most functions of this class are asynchronous.
skipping to change at line 201 skipping to change at line 201
* otherwise. * otherwise.
* *
* \see hasVideoChanged * \see hasVideoChanged
*/ */
bool hasVideo() const; bool hasVideo() const;
/** /**
* Check whether the current media may be seeked. * Check whether the current media may be seeked.
* *
* \warning This information cannot be known immediately. It is best * \warning This information cannot be known immediately. It is best
* to also listen to the hasVideoChanged signal. * to also listen to the seekableChanged signal.
* *
* \code * \code
* connect(media, SIGNAL(hasVideoChanged(bool)), hasVideoChan ged(bool)); * connect(media, SIGNAL(seekableChanged(bool)), seekableChan ged(bool));
* media->setCurrentSource("somevideo.avi"); * media->setCurrentSource("somevideo.avi");
* media->hasVideo(); // returns false; * media->isSeekable(); // returns false;
* } * }
* *
* void hasVideoChanged(bool b) * void seekableChanged(bool b)
* { * {
* // b == true * // b == true
* media->hasVideo(); // returns true; * media->isSeekable(); // returns true;
* } * }
* \endcode * \endcode
* *
* \return \c true when the current media may be seeked. \c fal se * \return \c true when the current media may be seeked. \c fal se
* otherwise. * otherwise.
* *
* \see seekableChanged() * \see seekableChanged()
*/ */
bool isSeekable() const; bool isSeekable() const;
skipping to change at line 304 skipping to change at line 304
* \code * \code
* QUrl url("http://www.example.com/music.ogg"); * QUrl url("http://www.example.com/music.ogg");
* media->setCurrentSource(url); * media->setCurrentSource(url);
* \endcode * \endcode
* *
* \see currentSource * \see currentSource
*/ */
void setCurrentSource(const MediaSource &source); void setCurrentSource(const MediaSource &source);
/** /**
* Returns the queued media sources. This does list does not in clude * Returns the queued media sources. This list does not include
* the current source (returned by currentSource). * the current source (returned by currentSource).
*/ */
QList<MediaSource> queue() const; QList<MediaSource> queue() const;
/** /**
* Set the MediaSources to play when the current media has fini shed. * Set the MediaSources to play when the current media has fini shed.
* *
* This function will overwrite the current queue. * This function will overwrite the current queue.
* *
* \see clearQueue * \see clearQueue
skipping to change at line 459 skipping to change at line 459
/** /**
* Stops and removes all playing and enqueued media sources. * Stops and removes all playing and enqueued media sources.
* *
* \see setCurrentSource * \see setCurrentSource
*/ */
void clear(); void clear();
Q_SIGNALS: Q_SIGNALS:
/** /**
* Emitted when the state of the MediaObject has changed. * Emitted when the state of the MediaObject has changed.
* In case you're not interested in the old state you can also
* connect to a slot that only has one State argument.
* *
* @param newstate The state the Player is in now. * @param newstate The state the Player is in now.
* @param oldstate The state the Player was in before. * @param oldstate The state the Player was in before.
*/ */
void stateChanged(Phonon::State newstate, Phonon::State oldstat e); void stateChanged(Phonon::State newstate, Phonon::State oldstat e);
/** /**
* This signal gets emitted every tickInterval milliseconds. * This signal gets emitted every tickInterval milliseconds.
* *
* @param time The position of the media file in milliseconds. * @param time The position of the media file in milliseconds.
skipping to change at line 590 skipping to change at line 588
* \see setPrefinishMark * \see setPrefinishMark
* \see prefinishMark * \see prefinishMark
* \see aboutToFinish * \see aboutToFinish
* \see finished * \see finished
*/ */
void prefinishMarkReached(qint32 msecToEnd); void prefinishMarkReached(qint32 msecToEnd);
/** /**
* This signal is emitted as soon as the total time of the medi a file is * This signal is emitted as soon as the total time of the medi a file is
* known or has changed. For most non-local media data the tota l * known or has changed. For most non-local media data the tota l
* time of the media can only be known after some time. At that time the * time of the media can only be known after some time. Initial ly the
* totalTime function can not return useful information. You ha ve * totalTime function can not return useful information. You ha ve
* to wait for this signal to know the real total time. * to wait for this signal to know the real total time.
* *
* \param newTotalTime The length of the media file in millisec onds. * \param newTotalTime The length of the media file in millisec onds.
* *
* \see totalTime * \see totalTime
*/ */
void totalTimeChanged(qint64 newTotalTime); void totalTimeChanged(qint64 newTotalTime);
protected: protected:
 End of changes. 9 change blocks. 
10 lines changed or deleted 8 lines changed or added


 mediaobjectinterface.h   mediaobjectinterface.h 
skipping to change at line 36 skipping to change at line 36
#include "mediaobject.h" #include "mediaobject.h"
#include <QtCore/QObject> #include <QtCore/QObject>
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Phonon namespace Phonon
{ {
class StreamInterface; class StreamInterface;
/** \class MediaObjectInterface mediaobjectinterface.h Phonon/MediaObjectIn terface /** \class MediaObjectInterface mediaobjectinterface.h phonon/MediaObjectIn terface
* \short Backend interface for media sources. * \short Backend interface for media sources.
* *
* The backend implementation has to provide two signals, that are not defi ned * The backend implementation has to provide two signals, that are not defi ned
* in this interface: * in this interface:
* <ul> * <ul>
* <li>\anchor phonon_MediaObjectInterface_stateChanged * <li>\anchor phonon_MediaObjectInterface_stateChanged
* <b>void stateChanged(\ref Phonon::State newstate, \ref Phonon::State old state)</b> * <b>void stateChanged(\ref Phonon::State newstate, \ref Phonon::State old state)</b>
* *
* Emitted when the state of the MediaObject has changed. * Emitted when the state of the MediaObject has changed.
* In case you're not interested in the old state you can also * In case you're not interested in the old state you can also
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 objectdescriptionmodel.h   objectdescriptionmodel.h 
skipping to change at line 38 skipping to change at line 38
#include "objectdescription.h" #include "objectdescription.h"
#include <QtCore/QList> #include <QtCore/QList>
#include <QtCore/QModelIndex> #include <QtCore/QModelIndex>
#include <QtCore/QStringList> #include <QtCore/QStringList>
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_PHONON_OBJECTDESCRIPTIONMODEL #ifndef QT_NO_PHONON_OBJECTDESCRIPTIONMODEL
/* MinGW 3.4.x gives an ICE when trying to instantiate one of the
ObjectDescriptionModel<foo> classes because it can't handle
half exported classes correct. gcc 4.3.x has a fix for this but
we currently there's no official gcc 4.3 on windows available.
Because of this we need this little hack
*/
#if defined(Q_CC_MINGW)
#define PHONON_EXPORT_ODM
#else
#define PHONON_EXPORT_ODM PHONON_EXPORT
#endif
namespace Phonon namespace Phonon
{ {
class ObjectDescriptionModelDataPrivate; class ObjectDescriptionModelDataPrivate;
/** \internal /** \internal
* \class ObjectDescriptionModelData objectdescriptionmodel.h Phonon/Ob jectDescriptionModelData * \class ObjectDescriptionModelData objectdescriptionmodel.h phonon/Ob jectDescriptionModelData
* \brief Data class for models for ObjectDescription objects. * \brief Data class for models for ObjectDescription objects.
* *
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class PHONON_EXPORT ObjectDescriptionModelData class PHONON_EXPORT ObjectDescriptionModelData
{ {
public: public:
/** /**
* Returns the number of rows in the model. This value correspo nds * Returns the number of rows in the model. This value correspo nds
* to the size of the list passed through setModelData. * to the size of the list passed through setModelData.
skipping to change at line 154 skipping to change at line 142
bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex()); bool removeRows(int row, int count, const QModelIndex &parent = QModelIndex());
QStringList mimeTypes(ObjectDescriptionType type) const; QStringList mimeTypes(ObjectDescriptionType type) const;
ObjectDescriptionModelData(QAbstractListModel *); ObjectDescriptionModelData(QAbstractListModel *);
protected: protected:
~ObjectDescriptionModelData(); ~ObjectDescriptionModelData();
//ObjectDescriptionModelData(ObjectDescriptionModelDataPrivate *dd); //ObjectDescriptionModelData(ObjectDescriptionModelDataPrivate *dd);
ObjectDescriptionModelDataPrivate *const d; ObjectDescriptionModelDataPrivate *const d;
}; };
/* Required to ensure template class vtables are exported on both symbian
and existing builds. */
#if defined(Q_OS_SYMBIAN) && defined(Q_CC_RVCT)
// RVCT compiler (2.2.686) requires the export declaration to be on the cla
ss to export vtables
// MWC compiler works both ways
// GCCE compiler is unknown (it can't compile QtCore yet)
#define PHONON_TEMPLATE_CLASS_EXPORT PHONON_EXPORT
#define PHONON_TEMPLATE_CLASS_MEMBER_EXPORT
#else
// Windows builds (at least) do not support export declaration on templated
class
// But if you export a member function, the vtable is implicitly exported
#define PHONON_TEMPLATE_CLASS_EXPORT
#define PHONON_TEMPLATE_CLASS_MEMBER_EXPORT PHONON_EXPORT
#endif
/** \class ObjectDescriptionModel objectdescriptionmodel.h Phonon/Objec tDescriptionModel /** \class ObjectDescriptionModel objectdescriptionmodel.h Phonon/Objec tDescriptionModel
* \short The ObjectDescriptionModel class provides a model from * \short The ObjectDescriptionModel class provides a model from
* a list of ObjectDescription objects. * a list of ObjectDescription objects.
* *
* ObjectDescriptionModel is a readonly model that supplies a list * ObjectDescriptionModel is a readonly model that supplies a list
* using ObjectDescription::name() for the text and * using ObjectDescription::name() for the text and
* ObjectDescription::description() for the tooltip. If set the propert ies * ObjectDescription::description() for the tooltip. If set the propert ies
* "icon" and "available" are used to set the decoration and disable th e * "icon" and "available" are used to set the decoration and disable th e
* item (disabled only visually, you can still select and drag it). * item (disabled only visually, you can still select and drag it).
* *
skipping to change at line 190 skipping to change at line 193
* And to retrieve the selected AudioOutputDevice: * And to retrieve the selected AudioOutputDevice:
* \code * \code
* int cbIndex = cb->currentIndex(); * int cbIndex = cb->currentIndex();
* AudioOutputDevice selectedDevice = model->modelData(cbIndex); * AudioOutputDevice selectedDevice = model->modelData(cbIndex);
* \endcode * \endcode
* *
* \ingroup Frontend * \ingroup Frontend
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
template<ObjectDescriptionType type> template<ObjectDescriptionType type>
class ObjectDescriptionModel : public QAbstractListModel class PHONON_TEMPLATE_CLASS_EXPORT ObjectDescriptionModel : public QAbs tractListModel
{ {
public: public:
Q_OBJECT_CHECK Q_OBJECT_CHECK
/** \internal */ /** \internal */
static PHONON_EXPORT const QMetaObject staticMetaObject; static PHONON_TEMPLATE_CLASS_MEMBER_EXPORT const QMetaObject st aticMetaObject;
/** \internal */ /** \internal */
PHONON_EXPORT_ODM const QMetaObject *metaObject() const; PHONON_TEMPLATE_CLASS_MEMBER_EXPORT const QMetaObject *metaObje ct() const;
/** \internal */ /** \internal */
PHONON_EXPORT_ODM void *qt_metacast(const char *_clname); PHONON_TEMPLATE_CLASS_MEMBER_EXPORT void *qt_metacast(const cha r *_clname);
//int qt_metacall(QMetaObject::Call _c, int _id, void **_a); //int qt_metacall(QMetaObject::Call _c, int _id, void **_a);
/** /**
* Returns the number of rows in the model. This value correspo nds * Returns the number of rows in the model. This value correspo nds
* to the size of the list passed through setModelData. * to the size of the list passed through setModelData.
* *
* \param parent The optional \p parent argument is used in mos t models to specify * \param parent The optional \p parent argument is used in mos t models to specify
* the parent of the rows to be counted. Because this is a list if a * the parent of the rows to be counted. Because this is a list if a
* valid parent is specified the result will always be 0. * valid parent is specified the result will always be 0.
* *
skipping to change at line 298 skipping to change at line 302
explicit inline ObjectDescriptionModel(const QList<ObjectDescri ption<type> > &data, QObject *parent = 0) //krazy:exclude=inline explicit inline ObjectDescriptionModel(const QList<ObjectDescri ption<type> > &data, QObject *parent = 0) //krazy:exclude=inline
: QAbstractListModel(parent), d(new ObjectDescriptionModelD ata(this)) { setModelData(data); } : QAbstractListModel(parent), d(new ObjectDescriptionModelD ata(this)) { setModelData(data); }
/** /**
* Sets the model data using the list provided by \p data. * Sets the model data using the list provided by \p data.
* *
* All previous model data is cleared. * All previous model data is cleared.
*/ */
inline void setModelData(const QList<ObjectDescription<type> > &data) { //krazy:exclude=inline inline void setModelData(const QList<ObjectDescription<type> > &data) { //krazy:exclude=inline
QList<QExplicitlySharedDataPointer<ObjectDescriptionData> > list; QList<QExplicitlySharedDataPointer<ObjectDescriptionData> > list;
Q_FOREACH (const ObjectDescription<type> &desc, data) { for (int i = 0; i < data.count(); ++i) {
list << desc.d; list += data.at(i).d;
} }
d->setModelData(list); d->setModelData(list);
} }
/** /**
* Returns the model data. * Returns the model data.
* *
* As the order of the list might have changed this can be diff erent * As the order of the list might have changed this can be diff erent
* to what was set using setModelData(). * to what was set using setModelData().
*/ */
inline QList<ObjectDescription<type> > modelData() const { //kr azy:exclude=inline inline QList<ObjectDescription<type> > modelData() const { //kr azy:exclude=inline
QList<ObjectDescription<type> > ret; QList<ObjectDescription<type> > ret;
QList<QExplicitlySharedDataPointer<ObjectDescriptionData> > list = d->modelData(); QList<QExplicitlySharedDataPointer<ObjectDescriptionData> > list = d->modelData();
Q_FOREACH (const QExplicitlySharedDataPointer<ObjectDescrip for (int i = 0; i < list.count(); ++i) {
tionData> &data, list) { ret << ObjectDescription<type>(list.at(i));
ret << ObjectDescription<type>(data);
} }
return ret; return ret;
} }
/** /**
* Returns one ObjectDescription of the model data for the give n \p index. * Returns one ObjectDescription of the model data for the give n \p index.
*/ */
inline ObjectDescription<type> modelData(const QModelIndex &ind ex) const { return ObjectDescription<type>(d->modelData(index)); } //krazy: exclude=inline inline ObjectDescription<type> modelData(const QModelIndex &ind ex) const { return ObjectDescription<type>(d->modelData(index)); } //krazy: exclude=inline
/** /**
 End of changes. 10 change blocks. 
22 lines changed or deleted 27 lines changed or added


 packet.h   packet.h 
skipping to change at line 31 skipping to change at line 31
#define PHONON_PACKET_H #define PHONON_PACKET_H
#include "export.h" #include "export.h"
namespace Phonon namespace Phonon
{ {
class PacketPool; class PacketPool;
struct PacketPrivate; struct PacketPrivate;
/** \class Packet packetpool.h Phonon/Packet /** \class Packet packetpool.h phonon/Packet
* \brief Class to access memory preallocated by PacketPool * \brief Class to access memory preallocated by PacketPool
* *
* \note PacketPool and Packet are threadsafe. * \note PacketPool and Packet are threadsafe.
* *
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class PHONONEXPERIMENTAL_EXPORT Packet class PHONONEXPERIMENTAL_EXPORT Packet
{ {
friend class PacketPoolPrivate; friend class PacketPoolPrivate;
Q_DECLARE_PRIVATE(Packet) Q_DECLARE_PRIVATE(Packet)
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 packetpool.h   packetpool.h 
skipping to change at line 30 skipping to change at line 30
#ifndef PHONON_PACKETPOOL_H #ifndef PHONON_PACKETPOOL_H
#define PHONON_PACKETPOOL_H #define PHONON_PACKETPOOL_H
#include "export.h" #include "export.h"
namespace Phonon namespace Phonon
{ {
class Packet; class Packet;
class PacketPoolPrivate; class PacketPoolPrivate;
/** \class PacketPool packetpool.h Phonon/PacketPool /** \class PacketPool packetpool.h phonon/PacketPool
* \brief Class to preallocate memory. * \brief Class to preallocate memory.
* *
* \note PacketPool and Packet are threadsafe. * \note PacketPool and Packet are threadsafe.
* *
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class PHONONEXPERIMENTAL_EXPORT PacketPool class PHONONEXPERIMENTAL_EXPORT PacketPool
{ {
Q_DECLARE_PRIVATE(PacketPool) Q_DECLARE_PRIVATE(PacketPool)
friend class Packet; friend class Packet;
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 path.h   path.h 
skipping to change at line 43 skipping to change at line 43
template<class T> class QList; template<class T> class QList;
namespace Phonon namespace Phonon
{ {
class PathPrivate; class PathPrivate;
class Effect; class Effect;
class MediaNode; class MediaNode;
/** \class Path path.h Phonon/Path /** \class Path path.h phonon/Path
* \short Connection object providing convenient effect insertion * \short Connection object providing convenient effect insertion
* *
* \code * \code
MediaObject *media = new MediaObject; MediaObject *media = new MediaObject;
AudioOutput *output = new AudioOutput(Phonon::MusicCategory); AudioOutput *output = new AudioOutput(Phonon::MusicCategory);
Path path = Phonon::createPath(media, output); Path path = Phonon::createPath(media, output);
Q_ASSERT(path.isValid()); // for this simple case the path should always be Q_ASSERT(path.isValid()); // for this simple case the path should always be
//valid - there are unit tests to ensure it //valid - there are unit tests to ensure it
// insert an effect // insert an effect
QList<EffectDescription> effectList = BackendCapabilities::availableAudioEf fects(); QList<EffectDescription> effectList = BackendCapabilities::availableAudioEf fects();
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 pulsesupport.h   pulsesupport.h 
skipping to change at line 38 skipping to change at line 38
#include "objectdescription.h" #include "objectdescription.h"
#include <QtCore/QtGlobal> #include <QtCore/QtGlobal>
#include <QtCore/QSet> #include <QtCore/QSet>
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
namespace Phonon namespace Phonon
{ {
class PulseStream;
class PHONON_EXPORT PulseSupport : public QObject class PHONON_EXPORT PulseSupport : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
static PulseSupport* getInstance(); 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;
void setOutputDevicePriorityForCategory(Category category, QLis t<int> order); void setOutputDevicePriorityForCategory(Category category, QLis t<int> order);
void setCaptureDevicePriorityForCategory(Category category, QLi st<int> order); void setCaptureDevicePriorityForCategory(Category category, QLi st<int> order);
void setStreamPropList(Category category, QString streamUuid); PulseStream *registerOutputStream(QString streamUuid, Category
category);
PulseStream *registerCaptureStream(QString streamUuid, Category
category);
void emitObjectDescriptionChanged(ObjectDescriptionType); void emitObjectDescriptionChanged(ObjectDescriptionType);
bool setOutputName(QString streamUuid, QString name);
bool setOutputDevice(QString streamUuid, int device); bool setOutputDevice(QString streamUuid, int device);
bool setOutputVolume(QString streamUuid, qreal volume);
bool setOutputMute(QString streamUuid, bool mute);
bool setCaptureDevice(QString streamUuid, int device); bool setCaptureDevice(QString streamUuid, int device);
// NB Capture Volume/Mute not set until PA supports per-source-
output volumes/mutes
// or phonon supports capture properly... which ever comes f
irst.
void clearStreamCache(QString streamUuid); void clearStreamCache(QString streamUuid);
public slots:
void connectToDaemon();
signals: signals:
void objectDescriptionChanged(ObjectDescriptionType); void objectDescriptionChanged(ObjectDescriptionType);
private: private:
PulseSupport(); PulseSupport();
~PulseSupport(); ~PulseSupport();
bool mEnabled; bool mEnabled;
}; };
} // namespace Phonon } // namespace Phonon
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER
 End of changes. 7 change blocks. 
1 lines changed or deleted 16 lines changed or added


 seekslider.h   seekslider.h 
skipping to change at line 42 skipping to change at line 42
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_PHONON_SEEKSLIDER #ifndef QT_NO_PHONON_SEEKSLIDER
namespace Phonon namespace Phonon
{ {
class MediaObject; class MediaObject;
class SeekSliderPrivate; class SeekSliderPrivate;
/** \class SeekSlider seekslider.h Phonon/SeekSlider /** \class SeekSlider seekslider.h phonon/SeekSlider
* \short Widget providing a slider for seeking in MediaObject objects. * \short Widget providing a slider for seeking in MediaObject objects.
* *
* \ingroup PhononWidgets * \ingroup PhononWidgets
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class PHONON_EXPORT SeekSlider : public QWidget class PHONON_EXPORT SeekSlider : public QWidget
{ {
Q_OBJECT Q_OBJECT
K_DECLARE_PRIVATE(SeekSlider) K_DECLARE_PRIVATE(SeekSlider)
/** /**
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 streaminterface.h   streaminterface.h 
skipping to change at line 39 skipping to change at line 39
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM #ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
namespace Phonon namespace Phonon
{ {
class StreamInterfacePrivate; class StreamInterfacePrivate;
class MediaSource; class MediaSource;
/** \class StreamInterface streaminterface.h Phonon/StreamInterface /** \class StreamInterface streaminterface.h phonon/StreamInterface
* \brief Backend interface to handle media streams (AbstractMediaStream). * \brief Backend interface to handle media streams (AbstractMediaStream).
* *
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class PHONON_EXPORT StreamInterface class PHONON_EXPORT StreamInterface
{ {
friend class StreamInterfacePrivate; friend class StreamInterfacePrivate;
friend class AbstractMediaStreamPrivate; friend class AbstractMediaStreamPrivate;
public: public:
virtual ~StreamInterface(); virtual ~StreamInterface();
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 videoplayer.h   videoplayer.h 
skipping to change at line 43 skipping to change at line 43
#ifndef QT_NO_PHONON_VIDEOPLAYER #ifndef QT_NO_PHONON_VIDEOPLAYER
namespace Phonon namespace Phonon
{ {
class VideoPlayerPrivate; class VideoPlayerPrivate;
class MediaObject; class MediaObject;
class AudioOutput; class AudioOutput;
class VideoWidget; class VideoWidget;
/** \class VideoPlayer videoplayer.h Phonon/VideoPlayer /** \class VideoPlayer videoplayer.h phonon/VideoPlayer
* \short Playback class for simple tasks. * \short Playback class for simple tasks.
* *
* With %VideoPlayer you can get results quickly and easily. You can do the standard * With %VideoPlayer you can get results quickly and easily. You can do the standard
* playback tasks like play, pause and stop, but also set a playback volume and * playback tasks like play, pause and stop, but also set a playback volume and
* seek (there's no guarantee that the seek will work, though). * seek (there's no guarantee that the seek will work, though).
* *
* Keep in mind that when the %VideoPlayer instance is deleted the playback will * Keep in mind that when the %VideoPlayer instance is deleted the playback will
* stop. * stop.
* *
* A play and forget code example: * A play and forget code example:
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 volumefadereffect.h   volumefadereffect.h 
skipping to change at line 38 skipping to change at line 38
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT #ifndef QT_NO_PHONON_VOLUMEFADEREFFECT
namespace Phonon namespace Phonon
{ {
class VolumeFaderEffectPrivate; class VolumeFaderEffectPrivate;
/** \class VolumeFaderEffect volumefadereffect.h Phonon/VolumeFaderEffe ct /** \class VolumeFaderEffect volumefadereffect.h phonon/VolumeFaderEffe ct
* Audio effect to gradually fade the audio volume. * Audio effect to gradually fade the audio volume.
* *
* This effect differs from gradually changing the output volume in tha t * This effect differs from gradually changing the output volume in tha t
* a dedicated effect can change the volume in the smallest possible * a dedicated effect can change the volume in the smallest possible
* steps while every other volume control will make more or less * steps while every other volume control will make more or less
* noticeable steps. * noticeable steps.
* *
* \ingroup PhononEffects * \ingroup PhononEffects
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
* \see AudioOutput::volume * \see AudioOutput::volume
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 volumeslider.h   volumeslider.h 
skipping to change at line 40 skipping to change at line 40
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifndef QT_NO_PHONON_VOLUMESLIDER #ifndef QT_NO_PHONON_VOLUMESLIDER
namespace Phonon namespace Phonon
{ {
class AudioOutput; class AudioOutput;
class VolumeSliderPrivate; class VolumeSliderPrivate;
/** \class VolumeSlider volumeslider.h Phonon/VolumeSlider /** \class VolumeSlider volumeslider.h phonon/VolumeSlider
* \short Widget providing a slider to control the volume of an AudioOutput . * \short Widget providing a slider to control the volume of an AudioOutput .
* *
* \ingroup PhononWidgets * \ingroup PhononWidgets
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class PHONON_EXPORT VolumeSlider : public QWidget class PHONON_EXPORT VolumeSlider : public QWidget
{ {
Q_OBJECT Q_OBJECT
K_DECLARE_PRIVATE(VolumeSlider) K_DECLARE_PRIVATE(VolumeSlider)
/** /**
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

This html diff was produced by rfcdiff 1.41. The latest version is available from http://tools.ietf.org/tools/rfcdiff/