abstractaudiooutput.h		abstractaudiooutput.h
	skipping to change at line 30		skipping to change at line 30
	*/		*/
	#ifndef Phonon_ABSTRACTAUDIOOUTPUTBASE_H		#ifndef Phonon_ABSTRACTAUDIOOUTPUTBASE_H
	#define Phonon_ABSTRACTAUDIOOUTPUTBASE_H		#define Phonon_ABSTRACTAUDIOOUTPUTBASE_H
	#include "phonondefs.h"		#include "phonondefs.h"
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "medianode.h"		#include "medianode.h"
	#include <QtCore/QObject>		#include <QtCore/QObject>
	QT_BEGIN_HEADER
	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
	P_DECLARE_PRIVATE(AbstractAudioOutput)		P_DECLARE_PRIVATE(AbstractAudioOutput)
	protected:		protected:
	AbstractAudioOutput(AbstractAudioOutputPrivate &dd, QObject *parent );		AbstractAudioOutput(AbstractAudioOutputPrivate &dd, QObject *parent );
	public:		public:
	~AbstractAudioOutput();		~AbstractAudioOutput();
	};		};
	} //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_ABSTRACTAUDIOOUTPUTBASE_H		#endif // Phonon_ABSTRACTAUDIOOUTPUTBASE_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	abstractmediastream.h		abstractmediastream.h
	skipping to change at line 30		skipping to change at line 30
	*/		*/
	#ifndef PHONON_ABSTRACTMEDIASTREAM_H		#ifndef PHONON_ABSTRACTMEDIASTREAM_H
	#define PHONON_ABSTRACTMEDIASTREAM_H		#define PHONON_ABSTRACTMEDIASTREAM_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "phononnamespace.h"		#include "phononnamespace.h"
	#include <QtCore/QObject>		#include <QtCore/QObject>
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	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
	skipping to change at line 224		skipping to change at line 221
	Q_INVOKABLE virtual void seekStream(qint64 offset);		Q_INVOKABLE virtual void seekStream(qint64 offset);
	AbstractMediaStream(AbstractMediaStreamPrivate &dd, QObject *parent );		AbstractMediaStream(AbstractMediaStreamPrivate &dd, QObject *parent );
	QScopedPointer<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_HEADER
	#endif // PHONON_ABSTRACTMEDIASTREAM_H		#endif // PHONON_ABSTRACTMEDIASTREAM_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	abstractvideooutput.h		abstractvideooutput.h
	skipping to change at line 30		skipping to change at line 30
	*/		*/
	#ifndef Phonon_ABSTRACTVIDEOOUTPUTBASE_H		#ifndef Phonon_ABSTRACTVIDEOOUTPUTBASE_H
	#define Phonon_ABSTRACTVIDEOOUTPUTBASE_H		#define Phonon_ABSTRACTVIDEOOUTPUTBASE_H
	#include "phonondefs.h"		#include "phonondefs.h"
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "medianode.h"		#include "medianode.h"
	#include <QtCore/QObject>		#include <QtCore/QObject>
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	#ifndef QT_NO_PHONON_VIDEO		#ifndef QT_NO_PHONON_VIDEO
	class QString;		class QString;
	namespace Phonon		namespace Phonon
	{		{
	namespace Experimental		namespace Experimental
	{		{
	class Visualization;		class Visualization;
	skipping to change at line 71		skipping to change at line 68
	* Constructor that is called from derived classes.		* Constructor that is called from derived classes.
	*		*
	* \param d the private object		* \param d the private object
	*/		*/
	AbstractVideoOutput(AbstractVideoOutputPrivate &d);		AbstractVideoOutput(AbstractVideoOutputPrivate &d);
	};		};
	} //namespace Phonon		} //namespace Phonon
	#endif //QT_NO_PHONON_VIDEO		#endif //QT_NO_PHONON_VIDEO
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // Phonon_ABSTRACTVIDEOOUTPUTBASE_H		#endif // Phonon_ABSTRACTVIDEOOUTPUTBASE_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	addoninterface.h		addoninterface.h
	skipping to change at line 32		skipping to change at line 32
	*/		*/
	#ifndef PHONON_ADDONINTERFACE_H		#ifndef PHONON_ADDONINTERFACE_H
	#define PHONON_ADDONINTERFACE_H		#define PHONON_ADDONINTERFACE_H
	#include "phononnamespace.h"		#include "phononnamespace.h"
	#include <QtCore/QList>		#include <QtCore/QList>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	QT_BEGIN_HEADER
	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
	skipping to change at line 93		skipping to change at line 90
	setTitle, /**< Sets the current tittle to the first \c i nt in the QList */		setTitle, /**< Sets the current tittle to the first \c i nt in the QList */
	autoplayTitles, /**< \returns \c bool whether autoplay of titl es is on */		autoplayTitles, /**< \returns \c bool whether autoplay of titl es is on */
	setAutoplayTitles /**< Sets autoplay to \c true or \c false as		setAutoplayTitles /**< Sets autoplay to \c true or \c false as
	indicated in the first \c bool in the QL ist */		indicated in the first \c bool in the QL ist */
	};		};
	enum SubtitleCommand {		enum SubtitleCommand {
	availableSubtitles, /**< \returns \c int representing the amoun t of		availableSubtitles, /**< \returns \c int representing the amoun t of
	available subtitles on the media sour ce */		available subtitles on the media sour ce */
	currentSubtitle, /**< \returns \c int representing the curre nt subtitle */		currentSubtitle, /**< \returns \c int representing the curre nt subtitle */
	setCurrentSubtitle /**< Sets the current subtitle to the first		setCurrentSubtitle, /**< Sets the current subtitle to the first
	\c int in the QList */		\c int in the QList */
			setCurrentSubtitleFile, /**< Sets the current subtitle to the f
			irst QUrl \since 4.7.0 */
			subtitleAutodetect, /**< \returns \c bool representing if subti
			tles
			autodetection is enabled \since 4.7.0
			*/
			setSubtitleAutodetect, /**< Sets/Unsets subtitles autodetection
			\since 4.7.0 */
			subtitleEncoding, /**< \returns a QString representing the curr
			ent encoding
			used to render subtitles \since 4.7.0 */
			setSubtitleEncoding, /** Sets the current encoding used to rend
			er subtitles \since 4.7.0 */
			subtitleFont, /**< \returns a QFont representing the current fo
			nt used
			to render subtitles \since 4.7.0 */
			setSubtitleFont /**< Sets the current font used to render subti
			tles \since 4.7.0 */
	};		};
	enum AudioChannelCommand {		enum AudioChannelCommand {
	availableAudioChannels, /**< \returns \c int representing the a mount		availableAudioChannels, /**< \returns \c int representing the a mount
	of all available audio channels o n the		of all available audio channels o n the
	media source */		media source */
	currentAudioChannel, /**< \returns \c int representing the c urrent		currentAudioChannel, /**< \returns \c int representing the c urrent
	audio channel */		audio channel */
	setCurrentAudioChannel /**< Sets the current audio channel to the first		setCurrentAudioChannel /**< Sets the current audio channel to the first
	\c int in the QList */		\c int in the QList */
	skipping to change at line 172		skipping to change at line 179
	virtual QVariant interfaceCall(Interface iface, int command,		virtual QVariant interfaceCall(Interface iface, int command,
	const QList<QVariant> &arguments = QList<QVariant>()) = 0;		const QList<QVariant> &arguments = QList<QVariant>()) = 0;
	};		};
	} // namespace Phonon		} // namespace Phonon
	Q_DECLARE_INTERFACE(Phonon::AddonInterface, "AddonInterface0.2.phonon.kde.o rg")		Q_DECLARE_INTERFACE(Phonon::AddonInterface, "AddonInterface0.2.phonon.kde.o rg")
	#endif //QT_NO_PHONON_MEDIACONTROLLER		#endif //QT_NO_PHONON_MEDIACONTROLLER
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_ADDONINTERFACE_H		#endif // PHONON_ADDONINTERFACE_H
End of changes. 4 change blocks.
	7 lines changed or deleted		19 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 130		skipping to change at line 127
	* 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.
	6 lines changed or deleted		0 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.
	6 lines changed or deleted		0 lines changed or added

	audioformat.h		audioformat.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_X_AUDIOFORMAT_H		#ifndef PHONON_X_AUDIOFORMAT_H
	#define PHONON_X_AUDIOFORMAT_H		#define PHONON_X_AUDIOFORMAT_H
	#include <QtCore/QtGlobal>		#include <QtCore/QtGlobal>
	#include "phononnamespace.h"		#include "phononnamespace.h"
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	namespace Phonon		namespace Phonon
	{		{
	namespace Experimental		namespace Experimental
	{		{
	class AudioFormatPrivate;		class AudioFormatPrivate;
	class AudioFormat		class AudioFormat
	{		{
	//Q_DECLARE_PRIVATE(AudioFormat)		//Q_DECLARE_PRIVATE(AudioFormat)
	public:		public:
	skipping to change at line 97		skipping to change at line 94
	} // namespace Experimental		} // namespace Experimental
	} // namespace Phonon		} // namespace Phonon
	#if defined(Q_CC_MSVC) && _MSC_VER <= 1300		#if defined(Q_CC_MSVC) && _MSC_VER <= 1300
	//this ensures that code outside Phonon can use the hash function		//this ensures that code outside Phonon can use the hash function
	//it also a workaround for some compilers		//it also a workaround for some compilers
	inline uint qHash(const Phonon::Experimental::AudioFormat &p) { return Phon on::Experimental::qHash(p); } //krazy:exclude=inline		inline uint qHash(const Phonon::Experimental::AudioFormat &p) { return Phon on::Experimental::qHash(p); } //krazy:exclude=inline
	#endif		#endif
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_X_AUDIOFORMAT_H		#endif // PHONON_X_AUDIOFORMAT_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	audiooutput.h		audiooutput.h
	skipping to change at line 31		skipping to change at line 31
	*/		*/
	#ifndef Phonon_AUDIOOUTPUT_H		#ifndef Phonon_AUDIOOUTPUT_H
	#define Phonon_AUDIOOUTPUT_H		#define Phonon_AUDIOOUTPUT_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "abstractaudiooutput.h"		#include "abstractaudiooutput.h"
	#include "phonondefs.h"		#include "phonondefs.h"
	#include "phononnamespace.h"		#include "phononnamespace.h"
	#include "objectdescription.h"		#include "objectdescription.h"
	QT_BEGIN_HEADER
	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.
	*		*
	skipping to change at line 177		skipping to change at line 174
	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_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))		Q_PRIVATE_SLOT(k_func(), void _k_deviceChanged(int device))
	};		};
	} //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_AUDIOOUTPUT_H		#endif // Phonon_AUDIOOUTPUT_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	audiooutputinterface.h		audiooutputinterface.h
	skipping to change at line 31		skipping to change at line 31
	*/		*/
	#ifndef PHONON_AUDIOOUTPUTINTERFACE_H		#ifndef PHONON_AUDIOOUTPUTINTERFACE_H
	#define PHONON_AUDIOOUTPUTINTERFACE_H		#define PHONON_AUDIOOUTPUTINTERFACE_H
	#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_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
	skipping to change at line 136		skipping to change at line 133
	* At the time of this writing the following driver strings are kno wn to be in use:		* At the time of this writing the following driver strings are kno wn to be in use:
	* \li \c alsa: The handle is the string to pass to snd_pcm_open (e .g. "dmix:CARD=0,DEV=1")		* \li \c alsa: The handle is the string to pass to snd_pcm_open (e .g. "dmix:CARD=0,DEV=1")
	* \li \c oss: The handle is the device file (e.g. "/dev/dsp")		* \li \c oss: The handle is the device file (e.g. "/dev/dsp")
	* \li \c pulseaudio: The handle contains the server string and the sink/source name		* \li \c pulseaudio: The handle contains the server string and the sink/source name
	* separated by a newline character.		* separated by a newline character.
	* (e.g. unix:/tmp/pulse-mkretz/native\nalsa_output.pci_8086_293e_s ound_card_0_alsa_playback_0)		* (e.g. unix:/tmp/pulse-mkretz/native\nalsa_output.pci_8086_293e_s ound_card_0_alsa_playback_0)
	*/		*/
	PHONON_EXPORT QList<QPair<QByteArray, QString> > deviceAccessListFo r(const Phonon::AudioOutputDevice &) const;		PHONON_EXPORT QList<QPair<QByteArray, QString> > deviceAccessListFo r(const Phonon::AudioOutputDevice &) const;
	};		};
			class AudioOutputInterface47 : public AudioOutputInterface42
			{
			public:
			/**
			* This function is meant to be used in conjuction with PulseSupport
			* to either get the property set for the associated PulseAudio straem
			or
			* to automatically apply them to the envrionment.
			*
			* If a backend subsystem supports actively setting arbitrary propertie
			s
			* this method should be preferred and PulseSupport::streamProperties()
			* should be used.
			* If a backend subsystem does not support setting arbitrary properties
			* PulseSupport::setupStreamEnvironment() should be called as close to
			* stream creation as possible to manipulate the process envrionment
			* such that PulseAudio will pick up the properties.
			*
			* \param uuid the UUID used by PulseSupport to identify the associated
			stream
			*
			* \since 4.7.0
			*/
			virtual void setStreamUuid(QString uuid) = 0;
			};
	} // namespace Phonon		} // namespace Phonon
	#ifdef PHONON_BACKEND_VERSION_4_2		#ifdef PHONON_BACKEND_VERSION_4_7
			namespace Phonon { typedef AudioOutputInterface47 AudioOutputInterface; }
			Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface40, "AudioOutputInterface2.
			phonon.kde.org")
			Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface42, "3AudioOutputInterface.
			phonon.kde.org")
			Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface, "4AudioOutputInterface.
			phonon.kde.org")
			#elif defined PHONON_BACKEND_VERSION_4_2
	namespace Phonon { typedef AudioOutputInterface42 AudioOutputInterface; }		namespace Phonon { typedef AudioOutputInterface42 AudioOutputInterface; }
	Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface40, "AudioOutputInterface2. phonon.kde.org")		Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface40, "AudioOutputInterface2. phonon.kde.org")
	Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface, "3AudioOutputInterface. phonon.kde.org")		Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface, "3AudioOutputInterface. phonon.kde.org")
			Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface47, "4AudioOutputInterface. phonon.kde.org")
	#else		#else
	namespace Phonon { typedef AudioOutputInterface40 AudioOutputInterface; }		namespace Phonon { typedef AudioOutputInterface40 AudioOutputInterface; }
	Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface, "AudioOutputInterface2. phonon.kde.org")		Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface, "AudioOutputInterface2. phonon.kde.org")
	Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface42, "3AudioOutputInterface. phonon.kde.org")		Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface42, "3AudioOutputInterface. phonon.kde.org")
			Q_DECLARE_INTERFACE(Phonon::AudioOutputInterface47, "4AudioOutputInterface. phonon.kde.org")
	#endif		#endif
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_AUDIOOUTPUTINTERFACE_H		#endif // PHONON_AUDIOOUTPUTINTERFACE_H
End of changes. 6 change blocks.
	7 lines changed or deleted		37 lines changed or added

	backendcapabilities.h		backendcapabilities.h
	skipping to change at line 31		skipping to change at line 31
	*/		*/
	#ifndef Phonon_BACKENDCAPABILITIES_H		#ifndef Phonon_BACKENDCAPABILITIES_H
	#define Phonon_BACKENDCAPABILITIES_H		#define Phonon_BACKENDCAPABILITIES_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "objectdescription.h"		#include "objectdescription.h"
	#include <QtCore/QObject>		#include <QtCore/QObject>
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	#ifdef __QT_SYNCQT__		#ifdef __QT_SYNCQT__
	// Tell syncqt that the BackendCapabilities namespace should be treated lik e a class		// Tell syncqt that the BackendCapabilities namespace should be treated lik e a class
	#pragma qt_class(Phonon::BackendCapabilities)		#pragma qt_class(Phonon::BackendCapabilities)
	#pragma qt_sync_stop_processing		#pragma qt_sync_stop_processing
	#endif		#endif
	template<class T> class QList;		template<class T> class QList;
	class QStringList;		class QStringList;
	namespace Phonon		namespace Phonon
	skipping to change at line 245		skipping to change at line 242
	/**		/**
	* Returns descriptions for the container formats the backend supports.		* Returns descriptions for the container formats the backend supports.
	*		*
	* \return A list of ContainerFormat objects that give a name and		* \return A list of ContainerFormat objects that give a name and
	* description for every supported container format.		* description for every supported container format.
	*/		*/
	// PHONON_EXPORT QList<ContainerFormatDescription> availableContainerFor mats();		// PHONON_EXPORT QList<ContainerFormatDescription> availableContainerFor mats();
	} // namespace BackendCapabilities		} // namespace BackendCapabilities
	} // namespace Phonon		} // namespace Phonon
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // Phonon_BACKENDCAPABILITIES_H		#endif // Phonon_BACKENDCAPABILITIES_H
	// vim: sw=4 ts=4 tw=80		// vim: sw=4 ts=4 tw=80
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	backendinterface.h		backendinterface.h
	skipping to change at line 32		skipping to change at line 32
	#ifndef PHONON_BACKENDINTERFACE_H		#ifndef PHONON_BACKENDINTERFACE_H
	#define PHONON_BACKENDINTERFACE_H		#define PHONON_BACKENDINTERFACE_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "objectdescription.h"		#include "objectdescription.h"
	#include <QtCore/QtGlobal>		#include <QtCore/QtGlobal>
	#include <QtCore/QSet>		#include <QtCore/QSet>
	QT_BEGIN_HEADER
	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.
	skipping to change at line 215		skipping to change at line 212
	VideoDataOutputClass,		VideoDataOutputClass,
	/**		/**
	* Request to return a %Effect object.		* Request to return a %Effect object.
	*		*
	* Takes an additional int that specifies the effect Id.		* Takes an additional int that specifies the effect Id.
	*/		*/
	EffectClass,		EffectClass,
	/**		/**
	* Request to return a %VideoWidget object.		* Request to return a %VideoWidget object.
	*/		*/
	VideoWidgetClass		VideoWidgetClass,
			VideoGraphicsObjectClass /* < Request to return a %VideoGraphic
			sObject */
	};		};
	/**		/**
	* Returns a new instance of the requested class.		* Returns a new instance of the requested class.
	*		*
	* \param c The requested class.		* \param c The requested class.
	* \param parent The parent object.		* \param parent The parent object.
	* \param args Additional arguments (documented in \ref Class).		* \param args Additional arguments (documented in \ref Class).
	*/		*/
	virtual QObject *createObject(Class c, QObject *parent, const QList <QVariant> &args = QList<QVariant>()) = 0;		virtual QObject *createObject(Class c, QObject *parent, const QList <QVariant> &args = QList<QVariant>()) = 0;
	skipping to change at line 284		skipping to change at line 282
	/**		/**
	* gets all available mime types		* gets all available mime types
	*/		*/
	virtual QStringList availableMimeTypes() const = 0;		virtual QStringList availableMimeTypes() const = 0;
	};		};
	} // namespace Phonon		} // namespace Phonon
	Q_DECLARE_INTERFACE(Phonon::BackendInterface, "BackendInterface3.phonon.kde .org")		Q_DECLARE_INTERFACE(Phonon::BackendInterface, "BackendInterface3.phonon.kde .org")
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_BACKENDINTERFACE_H		#endif // PHONON_BACKENDINTERFACE_H
End of changes. 3 change blocks.
	7 lines changed or deleted		3 lines changed or added

	effect.h		effect.h
	skipping to change at line 31		skipping to change at line 31
	*/		*/
	#ifndef PHONON_EFFECT_H		#ifndef PHONON_EFFECT_H
	#define PHONON_EFFECT_H		#define PHONON_EFFECT_H
	#include "phonondefs.h"		#include "phonondefs.h"
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include "objectdescription.h"		#include "objectdescription.h"
	#include "medianode.h"		#include "medianode.h"
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	#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;
	skipping to change at line 113		skipping to change at line 110
	QVariant parameterValue(const EffectParameter&) const;		QVariant parameterValue(const EffectParameter&) const;
	void setParameterValue(const EffectParameter&, const QVariant & value);		void setParameterValue(const EffectParameter&, const QVariant & value);
	protected:		protected:
	Effect(EffectPrivate &dd, QObject *parent);		Effect(EffectPrivate &dd, QObject *parent);
	};		};
	} //namespace Phonon		} //namespace Phonon
	#endif // QT_NO_EFFECT		#endif // QT_NO_EFFECT
	QT_END_NAMESPACE
	QT_END_HEADER
	// vim: sw=4 ts=4 tw=80		// vim: sw=4 ts=4 tw=80
	#endif // PHONON_EFFECT_H		#endif // PHONON_EFFECT_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	effectinterface.h		effectinterface.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_EFFECTINTERFACE_H		#ifndef PHONON_EFFECTINTERFACE_H
	#define PHONON_EFFECTINTERFACE_H		#define PHONON_EFFECTINTERFACE_H
	#include "phononnamespace.h"		#include "phononnamespace.h"
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	QT_BEGIN_HEADER
	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>
	*/		*/
	skipping to change at line 65		skipping to change at line 62
	* Sets the value for the selected parameter.		* Sets the value for the selected parameter.
	*/		*/
	virtual void setParameterValue(const EffectParameter &, const Q Variant &newValue) = 0;		virtual void setParameterValue(const EffectParameter &, const Q Variant &newValue) = 0;
	};		};
	} //namespace Phonon		} //namespace Phonon
	Q_DECLARE_INTERFACE(Phonon::EffectInterface, "EffectInterface0.phonon.kde.o rg")		Q_DECLARE_INTERFACE(Phonon::EffectInterface, "EffectInterface0.phonon.kde.o rg")
	#endif //QT_NO_PHONON_EFFECT		#endif //QT_NO_PHONON_EFFECT
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_EFFECTINTERFACE_H		#endif // PHONON_EFFECTINTERFACE_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	effectparameter.h		effectparameter.h
	skipping to change at line 31		skipping to change at line 31
	*/		*/
	#ifndef PHONON_EFFECTPARAMETER_H		#ifndef PHONON_EFFECTPARAMETER_H
	#define PHONON_EFFECTPARAMETER_H		#define PHONON_EFFECTPARAMETER_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include <QtCore/QExplicitlySharedDataPointer>		#include <QtCore/QExplicitlySharedDataPointer>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	QT_BEGIN_HEADER
	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.
	skipping to change at line 156		skipping to change at line 153
	* Only for backend developers:		* Only for backend developers:
	*		*
	* Flags to set the return values of isToggleControl(),		* Flags to set the return values of isToggleControl(),
	* isLogarithmicControl(), isIntegerControl(), isBoundedBelow() and		* isLogarithmicControl(), isIntegerControl(), isBoundedBelow() and
	* isBoundedAbove(). The values of the flags correspond to the valu es		* isBoundedAbove(). The values of the flags correspond to the valu es
	* used for LADSPA effects.		* used for LADSPA effects.
	*/		*/
	enum Hint {		enum Hint {
	/**		/**
	* If this hint is set it means that		* If this hint is set it means that
	* the the control has only two states: zero and non-zero.		* the control has only two states: zero and non-zero.
	*		*
	* \see isToggleControl()		* \see isToggleControl()
	*/		*/
	ToggledHint = 0x04,		ToggledHint = 0x04,
	/* LADSPA's SAMPLE_RATE hint needs to be translated by the back end		/* LADSPA's SAMPLE_RATE hint needs to be translated by the back end
	* to normal bounds, as the backend knows the sample rate - and the		* to normal bounds, as the backend knows the sample rate - and the
	* frontend doesn't */		* frontend doesn't */
	/**		/**
	skipping to change at line 233		skipping to change at line 230
	#if defined(Q_CC_MSVC) && _MSC_VER <= 1300		#if defined(Q_CC_MSVC) && _MSC_VER <= 1300
	//this ensures that code outside Phonon can use the hash function		//this ensures that code outside Phonon can use the hash function
	//it also a workaround for some compilers		//it also a workaround for some compilers
	inline uint qHash(const Phonon::EffectParameter &param) { return Phonon::qH ash(param); } //krazy:exclude=inline		inline uint qHash(const Phonon::EffectParameter &param) { return Phonon::qH ash(param); } //krazy:exclude=inline
	#endif		#endif
	Q_DECLARE_OPERATORS_FOR_FLAGS(Phonon::EffectParameter::Hints)		Q_DECLARE_OPERATORS_FOR_FLAGS(Phonon::EffectParameter::Hints)
	#endif //QT_NO_PHONON_EFFECT		#endif //QT_NO_PHONON_EFFECT
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_EFFECTPARAMETER_H		#endif // PHONON_EFFECTPARAMETER_H
	// vim: sw=4 ts=4 tw=80		// vim: sw=4 ts=4 tw=80
End of changes. 3 change blocks.
	7 lines changed or deleted		1 lines changed or added

	effectwidget.h		effectwidget.h
	skipping to change at line 28		skipping to change at line 28
	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_UI_EFFECTWIDGET_H		#ifndef PHONON_UI_EFFECTWIDGET_H
	#define PHONON_UI_EFFECTWIDGET_H		#define PHONON_UI_EFFECTWIDGET_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "phonondefs.h"		#include "phonondefs.h"
	#include <QtGui/QWidget>		#include <QWidget>
	QT_BEGIN_HEADER
	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
	skipping to change at line 71		skipping to change at line 68
	Q_PRIVATE_SLOT(k_func(), void _k_setToggleParameter(bool checke d))		Q_PRIVATE_SLOT(k_func(), void _k_setToggleParameter(bool checke d))
	Q_PRIVATE_SLOT(k_func(), void _k_setIntParameter(int value))		Q_PRIVATE_SLOT(k_func(), void _k_setIntParameter(int value))
	Q_PRIVATE_SLOT(k_func(), void _k_setDoubleParameter(double valu e))		Q_PRIVATE_SLOT(k_func(), void _k_setDoubleParameter(double valu e))
	Q_PRIVATE_SLOT(k_func(), void _k_setStringParameter(const QStri ng &))		Q_PRIVATE_SLOT(k_func(), void _k_setStringParameter(const QStri ng &))
	Q_PRIVATE_SLOT(k_func(), void _k_setSliderParameter(int))		Q_PRIVATE_SLOT(k_func(), void _k_setSliderParameter(int))
	};		};
	} // namespace Phonon		} // namespace Phonon
	#endif //QT_NO_PHONON_EFFECTWIDGET		#endif //QT_NO_PHONON_EFFECTWIDGET
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_UI_EFFECTWIDGET_H		#endif // PHONON_UI_EFFECTWIDGET_H
	// vim: sw=4 ts=4 tw=100		// vim: sw=4 ts=4 tw=100
End of changes. 2 change blocks.
	7 lines changed or deleted		1 lines changed or added

	globalconfig.h		globalconfig.h
	skipping to change at line 31		skipping to change at line 31
	*/		*/
	#ifndef PHONON_GLOBALCONFIG_H		#ifndef PHONON_GLOBALCONFIG_H
	#define PHONON_GLOBALCONFIG_H		#define PHONON_GLOBALCONFIG_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "phononnamespace.h"		#include "phononnamespace.h"
	#include "phonondefs.h"		#include "phonondefs.h"
	#include "objectdescription.h"		#include "objectdescription.h"
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	namespace Phonon		namespace Phonon
	{		{
	class GlobalConfigPrivate;		class GlobalConfigPrivate;
	class PHONON_EXPORT GlobalConfig		class PHONON_EXPORT GlobalConfig
	{		{
	P_DECLARE_PRIVATE(GlobalConfig)		P_DECLARE_PRIVATE(GlobalConfig)
	public:		public:
	GlobalConfig();		GlobalConfig();
	virtual ~GlobalConfig();		virtual ~GlobalConfig();
	skipping to change at line 89		skipping to change at line 86
	PHONON_DEPRECATED void setAudioCaptureDeviceListFor(Category catego ry, QList<int> order);		PHONON_DEPRECATED void setAudioCaptureDeviceListFor(Category catego ry, QList<int> order);
	PHONON_DEPRECATED QList<int> audioCaptureDeviceListFor(Category cat egory, int override = AdvancedDevicesFromSettings) const;		PHONON_DEPRECATED QList<int> audioCaptureDeviceListFor(Category cat egory, int override = AdvancedDevicesFromSettings) const;
	PHONON_DEPRECATED int audioCaptureDeviceFor(Category category, int override = AdvancedDevicesFromSettings) const;		PHONON_DEPRECATED int audioCaptureDeviceFor(Category category, int override = AdvancedDevicesFromSettings) const;
	#endif //PHONON_NO_AUDIOCAPTURE		#endif //PHONON_NO_AUDIOCAPTURE
	protected:		protected:
	GlobalConfigPrivate *const k_ptr;		GlobalConfigPrivate *const k_ptr;
	};		};
	} // namespace Phonon		} // namespace Phonon
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_GLOBALCONFIG_H		#endif // PHONON_GLOBALCONFIG_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	mediacontroller.h		mediacontroller.h
	skipping to change at line 33		skipping to change at line 33
	#ifndef PHONON_MEDIACONTROLLER_H		#ifndef PHONON_MEDIACONTROLLER_H
	#define PHONON_MEDIACONTROLLER_H		#define PHONON_MEDIACONTROLLER_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "objectdescription.h"		#include "objectdescription.h"
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QtGlobal>		#include <QtCore/QtGlobal>
	QT_BEGIN_HEADER
	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.
	*		*
	skipping to change at line 75		skipping to change at line 72
	Chapters = 2,		Chapters = 2,
	/**		/**
	* In the VOB format, navigations are menus to quickly navigate		* In the VOB format, navigations are menus to quickly navigate
	* to content.		* to content.
	*/		*/
	Navigations = 3,		Navigations = 3,
	/**		/**
	* On a CD, a title is a separate sound track. On DVD, a title is a		* On a CD, a title is a separate sound track. On DVD, a title is a
	* separate VOB file (i.e. usually a different video entity).		* separate VOB file (i.e. usually a different video entity).
	*/		*/
	Titles = 4		Titles = 4,
			/**
			* Subtitles for videos.
			*/
			Subtitles = 5,
			/**
			* Audio channel/track setting for sources with multiple tracks
			.
			* This can be a DVD or a regular file based container such as
			MKV or MP4.
			*/
			AudioChannels = 6
	};		};
	Q_DECLARE_FLAGS(Features, Feature)		Q_DECLARE_FLAGS(Features, Feature)
	enum NavigationMenu {		enum NavigationMenu {
	RootMenu, /** < Root/main menu. */		RootMenu, /** < Root/main menu. */
	TitleMenu, /** < Title Menu to access different titles on th e media source.		TitleMenu, /** < Title Menu to access different titles on th e media source.
	The title menu is usually where one would s elect		The title menu is usually where one would s elect
	the episode of a TV series DVD. It can be e qual to		the episode of a TV series DVD. It can be e qual to
	the main menu but does not need to be. */		the main menu but does not need to be. */
	AudioMenu, /** < Audio menu for language (and somtimes also subtitle)		AudioMenu, /** < Audio menu for language (and somtimes also subtitle)
	skipping to change at line 159		skipping to change at line 165
	/**		/**
	* Returns the selected subtitle stream.		* Returns the selected subtitle stream.
	*		*
	* \see availableSubtitles		* \see availableSubtitles
	* \see setCurrentSubtitle		* \see setCurrentSubtitle
	*/		*/
	SubtitleDescription currentSubtitle() const;		SubtitleDescription currentSubtitle() const;
	/**		/**
			* Subtitle auto-detection transparently tries to find a subtitle f
			ile
			* for the current MediaSource and will automatically select a poss
			ible
			* match. Detected subtitles are added to the regular subtitle
			* descriptions, allowing the user to deactivate it manually or swi
			tch
			* to another detected file.
			*
			* Matching method depends on the backend in use and may either be
			* driven by a backend or even subsystem implementation. Consequent
			ly
			* different backends may not give the same results. At any rate al
			l
			* algorithms are supposed to give as accurate as possible matches.
			* Should you require reproducible matching across backends you sho
			uld
			* deactivate auto-detection entirely and instead do the lookup you
			rself
			* and set the desired file using setCurrentSubtitle(QUrl); the fil
			e
			* will still be added to the subtitledescriptions model.
			*
			* \note Auto-detection is always activate so long as the backend s
			upports it.
			*
			* \returns \c true if subtitles are autodetected, otherwise \c fal
			se is
			* returned.
			*
			* \see setSubtitleAutodetect
			* \since 4.7.0
			*/
			bool subtitleAutodetect() const;
			/**
			* Returns the encoding used to render subtitles
			*
			* \see setSubtitleEncoding
			* \since 4.7.0
			*/
			QString subtitleEncoding() const;
			/**
			* Returns the font used to render subtitles
			*
			* \see setSubtitleFont
			* \see QApplication::setFont
			* \since 4.7.0
			*/
			QFont subtitleFont() const;
			/**
	* Returns the audio streams that can be selected by the user. The		* Returns the audio streams that can be selected by the user. The
	* strings can directly be used in the user interface.		* strings can directly be used in the user interface.
	*		*
	* \see selectedAudioChannel		* \see selectedAudioChannel
	* \see setCurrentAudioChannel		* \see setCurrentAudioChannel
	*/		*/
	QList<Phonon::AudioChannelDescription> availableAudioChannels() con st;		QList<Phonon::AudioChannelDescription> availableAudioChannels() con st;
	/**		/**
	* Returns the subtitle streams that can be selected by the user. T he		* Returns the subtitle streams that can be selected by the user. T he
	skipping to change at line 209		skipping to change at line 258
	* Some media formats allow multiple subtitle streams to be stored in		* Some media formats allow multiple subtitle streams to be stored in
	* the same file. Normally only one should be displayed.		* the same file. Normally only one should be displayed.
	*		*
	* \param stream description of a subtitle stream		* \param stream description of a subtitle stream
	*		*
	* \see availableSubtitles()		* \see availableSubtitles()
	* \see currentSubtitle()		* \see currentSubtitle()
	*/		*/
	void setCurrentSubtitle(const Phonon::SubtitleDescription &stream);		void setCurrentSubtitle(const Phonon::SubtitleDescription &stream);
			/**
			* \brief Selects a subtitle file as subtitle source for the media.
			*
			* \note The file will also be added to the model of SubtitleDescri
			ptions,
			* so you do not need special handling in the UI.
			*
			* \see setCurrentSubtitle(const Phonon::SubtitleDescription &strea
			m)
			*/
			void setCurrentSubtitle(const QUrl &url);
			/**
			* Sets/Unsets subtitles autodetection.
			*
			* Detection is attempted when moving the MediaObject into Playing
			state.
			* In order to enable/disable autodetection it must be set before p
			lay()
			* is called. Whether a MediaSource is set on the MediaObject does
			not
			* matter, and once detection is set it will remain set that way fo
			r
			* this exact combination of MediaController and MediaObject.
			*
			* \note The subtitle autodetection may only be changed in states o
			ther
			* than Playing | Buffering | Paused.
			*
			* \see subtitleAutodetect
			* \since 4.7.0
			*/
			void setSubtitleAutodetect(bool enable);
			/**
			* Selects the current encoding used to render subtitles.
			*
			* The encoding name must respect the
			* @link http://www.iana.org/assignments/character-sets
			* Link text IANA character-sets encoding file @endlink
			* If no encoding is explicitly set, it defaults to UTF-8.
			*
			* \note The subtitle encoding may only be changed in states other
			* than Playing | Buffering | Paused.
			* \note Decoding support may vary between backends.
			*
			* \see subtitleEncoding
			* \since 4.7.0
			*/
			void setSubtitleEncoding(const QString &encoding);
			/**
			* Selects the current font used to render subtitles.
			*
			* If no font is explicitly set, the system default font is used.
			*
			* \note The subtitle font may only be changed in states other
			* than Playing | Buffering | Paused.
			* \note Non-system fonts can not be used. In particular adding
			* fonts manually to the QFontDatabase will not make them
			* available as render fonts.
			*
			* \see subtitleFont
			* \since 4.7.0
			*/
			void setSubtitleFont(const QFont &font);
	public Q_SLOTS:		public Q_SLOTS:
	void setCurrentAngle(int angleNumber);		void setCurrentAngle(int angleNumber);
	void setCurrentChapter(int chapterNumber);		void setCurrentChapter(int chapterNumber);
	/**		/**
	* Skips to the given title \p titleNumber.		* Skips to the given title \p titleNumber.
	*		*
	* If it was playing before the title change it will start playback on the new title if		* If it was playing before the title change it will start playback on the new title if
	* autoplayTitles is enabled.		* autoplayTitles is enabled.
	*/		*/
	skipping to change at line 274		skipping to change at line 383
	} // namespace Phonon		} // namespace Phonon
	Q_DECLARE_OPERATORS_FOR_FLAGS(Phonon::MediaController::Features)		Q_DECLARE_OPERATORS_FOR_FLAGS(Phonon::MediaController::Features)
	Q_DECLARE_METATYPE(Phonon::MediaController::NavigationMenu)		Q_DECLARE_METATYPE(Phonon::MediaController::NavigationMenu)
	Q_DECLARE_METATYPE(QList<Phonon::MediaController::NavigationMenu>)		Q_DECLARE_METATYPE(QList<Phonon::MediaController::NavigationMenu>)
	#endif //QT_NO_PHONON_MEDIACONTROLLER		#endif //QT_NO_PHONON_MEDIACONTROLLER
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_MEDIACONTROLLER_H		#endif // PHONON_MEDIACONTROLLER_H
End of changes. 5 change blocks.
	7 lines changed or deleted		132 lines changed or added

	medianode.h		medianode.h
	skipping to change at line 31		skipping to change at line 31
	*/		*/
	#ifndef PHONON_MEDIANODE_H		#ifndef PHONON_MEDIANODE_H
	#define PHONON_MEDIANODE_H		#define PHONON_MEDIANODE_H
	#include "phonondefs.h"		#include "phonondefs.h"
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "path.h"		#include "path.h"
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	namespace Phonon		namespace Phonon
	{		{
	class Path;		class Path;
	class MediaNodePrivate;		class MediaNodePrivate;
	class PHONON_EXPORT MediaNode		class PHONON_EXPORT MediaNode
	{		{
	friend class Path;		friend class Path;
	friend class PathPrivate;		friend class PathPrivate;
	friend PHONON_EXPORT Path createPath(MediaNode *source, MediaNode * sink);		friend PHONON_EXPORT Path createPath(MediaNode *source, MediaNode * sink);
	skipping to change at line 66		skipping to change at line 63
	QList<Path> inputPaths() const;		QList<Path> inputPaths() const;
	QList<Path> outputPaths() const;		QList<Path> outputPaths() const;
	protected:		protected:
	MediaNode(MediaNodePrivate &dd);		MediaNode(MediaNodePrivate &dd);
	MediaNodePrivate *const k_ptr;		MediaNodePrivate *const k_ptr;
	};		};
	} // namespace Phonon		} // namespace Phonon
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_MEDIANODE_H		#endif // PHONON_MEDIANODE_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	mediaobject.h		mediaobject.h
	skipping to change at line 31		skipping to change at line 31
	*/		*/
	#ifndef Phonon_MEDIAOBJECT_H		#ifndef Phonon_MEDIAOBJECT_H
	#define Phonon_MEDIAOBJECT_H		#define Phonon_MEDIAOBJECT_H
	#include "medianode.h"		#include "medianode.h"
	#include "mediasource.h"		#include "mediasource.h"
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "phonondefs.h"		#include "phonondefs.h"
	#include "phononnamespace.h"		#include "phononnamespace.h"
	QT_BEGIN_HEADER
	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.
	skipping to change at line 237		skipping to change at line 234
	* }		* }
	* \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;
			/**
			* \brief The time interval in milliseconds between two ticks.
			*
			* The %tick interval is the time that elapses between the emis
			sion
			* of two tick signals.
			*
			* \returns the tick interval in milliseconds
			*/
	qint32 tickInterval() const;		qint32 tickInterval() const;
	/**		/**
	* Returns the strings associated with the given \p key.		* Returns the strings associated with the given \p key.
	*		*
	* Backends should use the keys specified in the Ogg Vorbis		* Backends should use the keys specified in the Ogg Vorbis
	* documentation: http://xiph.org/vorbis/doc/v-comment.html		* documentation: http://xiph.org/vorbis/doc/v-comment.html
	*		*
	* Therefore the following should work with every backend:		* Therefore the following should work with every backend:
	*		*
	skipping to change at line 389		skipping to change at line 394
	*		*
	* \see tick		* \see tick
	*/		*/
	qint64 currentTime() const;		qint64 currentTime() const;
	/**		/**
	* Get the total time (in milliseconds) of the file currently b eing played.		* Get the total time (in milliseconds) of the file currently b eing played.
	*		*
	* \return The total time in milliseconds.		* \return The total time in milliseconds.
	*		*
			* \note The total time may change throughout playback as more
			accurate
			* calculations become available, so it is recommended to
			connect
			* and use the totalTimeChanged signal whenever possible
			unless
			* best precision is not of importance.
			*
			* \warning The total time is undefined until the MediaObject e
			ntered
			* the PlayingState. A valid total time is always indi
			cated by
			* emission of the totalTimeChanged signal.
	* \see totalTimeChanged		* \see totalTimeChanged
	*/		*/
	qint64 totalTime() const;		qint64 totalTime() const;
	/**		/**
	* Get the remaining time (in milliseconds) of the file current ly being played.		* Get the remaining time (in milliseconds) of the file current ly being played.
	*		*
	* \return The remaining time in milliseconds.		* \return The remaining time in milliseconds.
	*/		*/
	qint64 remainingTime() const;		qint64 remainingTime() const;
	qint32 prefinishMark() const;		qint32 prefinishMark() const;
	void setPrefinishMark(qint32 msecToEnd);		void setPrefinishMark(qint32 msecToEnd);
	qint32 transitionTime() const;		qint32 transitionTime() const;
	void setTransitionTime(qint32 msec);		void setTransitionTime(qint32 msec);
	public Q_SLOTS:		public Q_SLOTS:
			/**
			* Sets the tick interval in milliseconds.
			*
			* \param newTickInterval the new tick interval in milliseconds
			.
			*
			* \see tickInterval
			*/
	void setTickInterval(qint32 newTickInterval);		void setTickInterval(qint32 newTickInterval);
	/**		/**
	* Requests playback of the media data to start. Playback only		* Requests playback of the media data to start. Playback only
	* starts when stateChanged() signals that it goes into Playing State,		* starts when stateChanged() signals that it goes into Playing State,
	* though.		* though.
	*		*
	* \par Possible states right after this call:		* \par Possible states right after this call:
	* \li BufferingState		* \li BufferingState
	* \li PlayingState		* \li PlayingState
	skipping to change at line 606		skipping to change at line 626
	*/		*/
	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. Initial ly 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.
	*		*
			* This signal may appear at any given point after a MediaSourc
			e was set.
			* Namely in the LoadingState, BufferingState, PlayingState or
			PausedState.
			*
			* \note When changing the currentSource there is no signal emi
			ssion until
			* a reasonable value for the new source has been calcula
			ted.
			*
	* \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:
	//MediaObject(Phonon::MediaObjectPrivate &dd, QObject *parent);		//MediaObject(Phonon::MediaObjectPrivate &dd, QObject *parent);
	private:		private:
	skipping to change at line 634		skipping to change at line 660
	Q_PRIVATE_SLOT(k_func(), void _k_stateChanged(Phonon::State, Ph onon::State))		Q_PRIVATE_SLOT(k_func(), void _k_stateChanged(Phonon::State, Ph onon::State))
	};		};
	/**		/**
	* Convenience function to create a MediaObject and AudioOutput connect ed by		* Convenience function to create a MediaObject and AudioOutput connect ed by
	* a path.		* a path.
	*/		*/
	PHONON_EXPORT MediaObject *createPlayer(Phonon::Category category, cons t MediaSource &source = MediaSource());		PHONON_EXPORT MediaObject *createPlayer(Phonon::Category category, cons t MediaSource &source = MediaSource());
	} //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_MEDIAOBJECT_H		#endif // Phonon_MEDIAOBJECT_H
End of changes. 6 change blocks.
	6 lines changed or deleted		40 lines changed or added

	mediaobjectinterface.h		mediaobjectinterface.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_MEDIAOBJECTINTERFACE_H		#ifndef PHONON_MEDIAOBJECTINTERFACE_H
	#define PHONON_MEDIAOBJECTINTERFACE_H		#define PHONON_MEDIAOBJECTINTERFACE_H
	#include "mediaobject.h"		#include "mediaobject.h"
	#include <QtCore/QObject>		#include <QtCore/QObject>
	QT_BEGIN_HEADER
	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>
	skipping to change at line 238		skipping to change at line 235
	virtual qint32 prefinishMark() const = 0;		virtual qint32 prefinishMark() const = 0;
	virtual void setPrefinishMark(qint32) = 0;		virtual void setPrefinishMark(qint32) = 0;
	virtual qint32 transitionTime() const = 0;		virtual qint32 transitionTime() const = 0;
	virtual void setTransitionTime(qint32) = 0;		virtual void setTransitionTime(qint32) = 0;
	};		};
	}		}
	Q_DECLARE_INTERFACE(Phonon::MediaObjectInterface, "MediaObjectInterface3.ph onon.kde.org")		Q_DECLARE_INTERFACE(Phonon::MediaObjectInterface, "MediaObjectInterface3.ph onon.kde.org")
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_MEDIAOBJECTINTERFACE_H		#endif // PHONON_MEDIAOBJECTINTERFACE_H
	// vim: sw=4 ts=4 tw=80		// vim: sw=4 ts=4 tw=80
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	mediasource.h		mediasource.h
	skipping to change at line 35		skipping to change at line 35
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "phononnamespace.h"		#include "phononnamespace.h"
	#include "mrl.h"		#include "mrl.h"
	#include "objectdescription.h"		#include "objectdescription.h"
	#include <QtCore/QSharedData>		#include <QtCore/QSharedData>
	#include <QtCore/QString>		#include <QtCore/QString>
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	class QUrl;		class QUrl;
	class QIODevice;		class QIODevice;
	namespace Phonon		namespace Phonon
	{		{
	class MediaSourcePrivate;		class MediaSourcePrivate;
	class AbstractMediaStream;		class AbstractMediaStream;
	/** \class MediaSource mediasource.h phonon/MediaSource		/** \class MediaSource mediasource.h phonon/MediaSource
	skipping to change at line 67		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 &);
	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.
	*/		*/
	skipping to change at line 100		skipping to change at line 98
	Disc,		Disc,
	/**		/**
	* The MediaSource object describes a data stream.		* The MediaSource object describes a data stream.
	*		*
	* This is also the type used for QIODevices.		* This is also the type used for QIODevices.
	*		*
	* \see AbstractMediaStream		* \see AbstractMediaStream
	*/		*/
	Stream,		Stream,
	/**		/**
	* The MediaSource object describes a capture device		* The MediaSource object describes a single capture device.
			* This could be either audio or video.
	*/		*/
	CaptureDevice,		CaptureDevice,
	/**		/**
	* An empty MediaSource.		* An empty MediaSource.
	*		*
	* It can be used to unload the current media from a MediaObjec t.		* It can be used to unload the current media from a MediaObjec t.
	*		*
	* \see MediaSource()		* \see MediaSource()
	*/		*/
	Empty		Empty,
			/**
			* The MediaSource object describes one device for video captur
			e and one for audio
			* capture. Facilitates capturing both audio and video at the s
			ame time, from
			* different devices.
			* It's essentially like two CaptureDevice media sources (one o
			f video type, one
			* of audio type) merged together.
			*/
			AudioVideoCapture
	/* post 4.0:		/* post 4.0:
	/ **		/ **
	* Links multiple MediaSource objects together.		* Links multiple MediaSource objects together.
	* /		* /
	Link		Link
	*/		*/
	};		};
	/**		/**
	* Creates an empty MediaSource.		* Creates an empty MediaSource.
	skipping to change at line 132		skipping to change at line 139
	* An empty MediaSource is considered valid and can be set on a Med iaObject to unload its		* An empty MediaSource is considered valid and can be set on a Med iaObject to unload its
	* current media.		* current media.
	*		*
	* \see Empty		* \see Empty
	*/		*/
	MediaSource();		MediaSource();
	/**		/**
	* Creates a MediaSource object for a local file or a Qt resource.		* Creates a MediaSource object for a local file or a Qt resource.
	*		*
			* \deprecated Use MediaSource(QUrl("qrc:///...")) for a Qt resourc
			e, MediaSource(QUrl::fromLocalFile("...")) for a local file, or MediaSource
			(QUrl("...")) for an URL.
			*
	* \param fileName file name of a local media file or a Qt resource that was compiled in.		* \param fileName file name of a local media file or a Qt resource that was compiled in.
	*/		*/
	MediaSource(const QString &fileName); //krazy:exclude=explicit		PHONON_DEPRECATED MediaSource(const QString &fileName); //krazy:exc lude=explicit
	/**		/**
	* Creates a MediaSource object for a URL.		* Creates a MediaSource object for a URL.
	*		*
			* A Qt resource can be specified by using an url with a qrc scheme
			.
			*
	* \param url URL to a media file or stream.		* \param url URL to a media file or stream.
	*/		*/
	MediaSource(const QUrl &url); //krazy:exclude=explicit		MediaSource(const QUrl &url); //krazy:exclude=explicit
	/**		/**
	* Creates a MediaSource object for discs.		* Creates a MediaSource object for discs.
	*		*
	* \param discType See \ref DiscType		* \param discType See \ref DiscType
	* \param deviceName A platform dependent device name. This can be useful if the computer		* \param deviceName A platform dependent device name. This can be useful if the computer
	* has more than one CD drive. It is recommended to use Solid to re trieve the device name in		* has more than one CD drive. It is recommended to use Solid to re trieve the device name in
	* a portable way.		* a portable way.
	*/		*/
	MediaSource(DiscType discType, const QString &deviceName = QString( )); //krazy:exclude=explicit		MediaSource(DiscType discType, const QString &deviceName = QString( )); //krazy:exclude=explicit
	#ifndef PHONON_NO_AUDIOCAPTURE		#ifndef PHONON_NO_AUDIOCAPTURE
	/**		/**
	* Creates a MediaSource object for audio capture devices.		* Creates a MediaSource object for audio capture devices.
			* If the device is valid, this creates a 'CaptureDevice' type Media Source.
	*/		*/
	MediaSource(const AudioCaptureDevice& device);		MediaSource(const AudioCaptureDevice& device);
	#endif		#endif
	#ifndef PHONON_NO_VIDEOCAPTURE		#ifndef PHONON_NO_VIDEOCAPTURE
	/**		/**
	* Creates a MediaSource object for video capture devices.		* Creates a MediaSource object for video capture devices.
			* If the device is valid, this creates a 'CaptureDevice' type Media Source
	*/		*/
	MediaSource(const VideoCaptureDevice& device);		MediaSource(const VideoCaptureDevice& device);
	#endif		#endif
	#if !defined(PHONON_NO_VIDEOCAPTURE) && !defined(PHONON_NO_AUDIOCAPTURE)		#if !defined(PHONON_NO_VIDEOCAPTURE) && !defined(PHONON_NO_AUDIOCAPTURE)
	/**		/**
	* Sets the source to the preferred audio capture device for the sp ecified category		* Sets the source to the preferred audio capture device for the sp ecified category
			* If a valid device is found, this creates a 'CaptureDevice' type MediaSource
	*/		*/
	MediaSource(Capture::DeviceType deviceType, CaptureCategory categor y = NoCaptureCategory);		MediaSource(Capture::DeviceType deviceType, CaptureCategory categor y = NoCaptureCategory);
			/**
			* Creates a MediaSource object that tries to describe a video capt
			ure device and
			* an audio capture device, together. The devices are appropriate f
			or the specified
			* category.
			*
			* If valid devices are found for both audio and video, then the re
			sulting MediaSource
			* is of type 'AudioVideoCapture'. If only an audio or a video vali
			d device is found,
			* the resulting type is 'CaptureDevice'. If no valid devices are f
			ound, the resulting
			* type is 'Invalid'.
			*/
			MediaSource(CaptureCategory category);
	#endif		#endif
	#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM		#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
	/**		/**
	* Creates a MediaSource object for a data stream.		* Creates a MediaSource object for a data stream.
	*		*
	* Your application can provide the media data by subclassing Abstr actMediaStream and		* Your application can provide the media data by subclassing Abstr actMediaStream and
	* passing a pointer to that object. %Phonon will never delete the \p stream.		* passing a pointer to that object. %Phonon will never delete the \p stream.
	*		*
	* \param stream The AbstractMediaStream subclass to provide the me dia data.		* \param stream The AbstractMediaStream subclass to provide the me dia data.
	skipping to change at line 285		skipping to change at line 311
	QUrl url() const;		QUrl url() const;
	/**		/**
	* Returns the disc type of the MediaSource if type() == Disc; othe rwise returns \ref		* Returns the disc type of the MediaSource if type() == Disc; othe rwise returns \ref
	* NoDisc.		* NoDisc.
	*/		*/
	DiscType discType() const;		DiscType discType() const;
	/**		/**
	* Returns the access list for the device of this media source. Val id for capture devices.		* Returns the access list for the device of this media source. Val id for capture devices.
			* \warning use only with MediaSource with type() == CaptureDevice
	*/		*/
	const DeviceAccessList& deviceAccessList() const;		const DeviceAccessList& deviceAccessList() const;
	/**		/**
			* Returns the access list for the video device used for capture.
			* Valid for type() == CaptureDevice or type() == AudioVideoCapture
			.
			* If used with CaptureDevice, the kind of device should be Video,
			for a valid result.
			*/
			const DeviceAccessList& videoDeviceAccessList() const;
			/**
			* Returns the access list for the audio device used for capture.
			* Valid for type() == CaptureDevice or type() == AudioVideoCapture
			.
			* If used with CaptureDevice, the kind of device should be Audio,
			for a valid result.
			*/
			const DeviceAccessList& audioDeviceAccessList() const;
			/**
	* Returns the device name of the MediaSource if type() == Disc; ot herwise returns		* Returns the device name of the MediaSource if type() == Disc; ot herwise returns
	* QString().		* QString().
	*/		*/
	QString deviceName() const;		QString deviceName() const;
	#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM		#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
	/**		/**
	* Returns the media stream of the MediaSource if type() == Stream; otherwise returns 0.		* Returns the media stream of the MediaSource if type() == Stream; otherwise returns 0.
	* QIODevices are handled as streams, too.		* QIODevices are handled as streams, too.
	*/		*/
	skipping to change at line 325		skipping to change at line 366
	/* post 4.0:		/* post 4.0:
	MediaSource(const QList<MediaSource> &mediaList);		MediaSource(const QList<MediaSource> &mediaList);
	QList<MediaSource> substreams() const;		QList<MediaSource> substreams() const;
	*/		*/
	protected:		protected:
	QExplicitlySharedDataPointer<MediaSourcePrivate> d;		QExplicitlySharedDataPointer<MediaSourcePrivate> d;
	MediaSource(MediaSourcePrivate &);		MediaSource(MediaSourcePrivate &);
	/**		PHONON_DEPRECATED MediaSource(const DeviceAccess &access);
	* Creates a MediaSource object for a capture device, directly from
	the device access info.
	*
	* \param access How can the device be accessed (driver name - alsa
	, oss, etc.) and device name
	*/
	MediaSource(const DeviceAccess &access);
	};		};
	} // namespace Phonon		PHONON_EXPORT QDebug operator <<(QDebug dbg, const Phonon::MediaSource &);
	QT_END_NAMESPACE		} // namespace Phonon
	QT_END_HEADER
	#endif // PHONON_MEDIASOURCE_H		#endif // PHONON_MEDIASOURCE_H
End of changes. 16 change blocks.
	17 lines changed or deleted		65 lines changed or added

	mrl.h		mrl.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_MRL_H		#ifndef PHONON_MRL_H
	#define PHONON_MRL_H		#define PHONON_MRL_H
	#include <QtCore/QUrl>		#include <QtCore/QUrl>
	#include "phonon_export.h"		#include "phonon_export.h"
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	namespace Phonon		namespace Phonon
	{		{
	/** \class Mrl mrl.h phonon/Mrl		/** \class Mrl mrl.h phonon/Mrl
	* Media Resource Locator - A QUrl particularly for MediaSources.		* Media Resource Locator - A QUrl particularly for MediaSources.
	*		*
	* Whenever working with URLs/URIs that actually are referencing a media re source		* Whenever working with URLs/URIs that actually are referencing a media re source
	* a Mrl should be used rather than a QUrl. Mrl has functions particularly		* a Mrl should be used rather than a QUrl. Mrl has functions particularly
	* made for a media related use case and additionally overloads some of QUr l's		* made for a media related use case and additionally overloads some of QUr l's
	* functions to work more reasonable in a Phonon context.		* functions to work more reasonable in a Phonon context.
	skipping to change at line 80		skipping to change at line 77
	*		*
	* \arg options QUrl::FormattingOptions to manipulate what the output s hould look like		* \arg options QUrl::FormattingOptions to manipulate what the output s hould look like
	*		*
	* \returns the encoded MRL or an empty QByteArray if the MRL was inval id		* \returns the encoded MRL or an empty QByteArray if the MRL was inval id
	*/		*/
	QByteArray toEncoded(FormattingOptions options = None) const;		QByteArray toEncoded(FormattingOptions options = None) const;
	};		};
	} // namespace Phonon		} // namespace Phonon
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_MRL_H		#endif // PHONON_MRL_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	objectdescription.h		objectdescription.h
	skipping to change at line 35		skipping to change at line 35
	#include "phonon_export.h"		#include "phonon_export.h"
	#include <QtCore/QExplicitlySharedDataPointer>		#include <QtCore/QExplicitlySharedDataPointer>
	#include <QtCore/QtDebug>		#include <QtCore/QtDebug>
	#include <QtCore/QList>		#include <QtCore/QList>
	#include <QtCore/QSharedData>		#include <QtCore/QSharedData>
	#include <QtCore/QString>		#include <QtCore/QString>
	#include <QtCore/QVariant>		#include <QtCore/QVariant>
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	namespace Phonon		namespace Phonon
	{		{
	class ObjectDescriptionPrivate;		class ObjectDescriptionPrivate;
	/**		/**
	* Defines the type of information that is contained in a ObjectDescrip tion		* Defines the type of information that is contained in a ObjectDescrip tion
	* object.		* object.
	*		*
	* \ingroup Backend		* \ingroup Backend
	*/		*/
	skipping to change at line 361		skipping to change at line 358
	*		*
	* \see DeviceAccess		* \see DeviceAccess
	* \see AudioCaptureDevice		* \see AudioCaptureDevice
	*/		*/
	typedef QList<DeviceAccess> DeviceAccessList;		typedef QList<DeviceAccess> DeviceAccessList;
	void PHONON_EXPORT_DEPRECATED registerMetaTypes();		void PHONON_EXPORT_DEPRECATED registerMetaTypes();
	} //namespace Phonon		} //namespace Phonon
	QT_END_NAMESPACE
	Q_DECLARE_METATYPE(Phonon::AudioOutputDevice)		Q_DECLARE_METATYPE(Phonon::AudioOutputDevice)
	Q_DECLARE_METATYPE(QList<Phonon::AudioOutputDevice>)		Q_DECLARE_METATYPE(QList<Phonon::AudioOutputDevice>)
	#ifndef PHONON_NO_AUDIOCAPTURE		#ifndef PHONON_NO_AUDIOCAPTURE
	Q_DECLARE_METATYPE(Phonon::AudioCaptureDevice)		Q_DECLARE_METATYPE(Phonon::AudioCaptureDevice)
	Q_DECLARE_METATYPE(QList<Phonon::AudioCaptureDevice>)		Q_DECLARE_METATYPE(QList<Phonon::AudioCaptureDevice>)
	#endif //PHONON_NO_AUDIOCAPTURE		#endif //PHONON_NO_AUDIOCAPTURE
	#ifndef PHONON_NO_VIDEOCAPTURE		#ifndef PHONON_NO_VIDEOCAPTURE
	Q_DECLARE_METATYPE(Phonon::VideoCaptureDevice)		Q_DECLARE_METATYPE(Phonon::VideoCaptureDevice)
	skipping to change at line 391		skipping to change at line 386
	#ifndef QT_NO_PHONON_MEDIACONTROLLER		#ifndef QT_NO_PHONON_MEDIACONTROLLER
	Q_DECLARE_METATYPE(Phonon::AudioChannelDescription)		Q_DECLARE_METATYPE(Phonon::AudioChannelDescription)
	Q_DECLARE_METATYPE(Phonon::SubtitleDescription)		Q_DECLARE_METATYPE(Phonon::SubtitleDescription)
	Q_DECLARE_METATYPE(QList<Phonon::AudioChannelDescription>)		Q_DECLARE_METATYPE(QList<Phonon::AudioChannelDescription>)
	Q_DECLARE_METATYPE(QList<Phonon::SubtitleDescription>)		Q_DECLARE_METATYPE(QList<Phonon::SubtitleDescription>)
	#endif //QT_NO_PHONON_MEDIACONTROLLER		#endif //QT_NO_PHONON_MEDIACONTROLLER
	Q_DECLARE_METATYPE(Phonon::DeviceAccess)		Q_DECLARE_METATYPE(Phonon::DeviceAccess)
	Q_DECLARE_METATYPE(Phonon::DeviceAccessList)		Q_DECLARE_METATYPE(Phonon::DeviceAccessList)
	QT_END_HEADER
	#endif // PHONON_OBJECTDESCRIPTION_H		#endif // PHONON_OBJECTDESCRIPTION_H
End of changes. 3 change blocks.
	7 lines changed or deleted		0 lines changed or added

	objectdescriptionmodel.h		objectdescriptionmodel.h
	skipping to change at line 33		skipping to change at line 33
	#ifndef PHONON_OBJECTDESCRIPTIONMODEL_H		#ifndef PHONON_OBJECTDESCRIPTIONMODEL_H
	#define PHONON_OBJECTDESCRIPTIONMODEL_H		#define PHONON_OBJECTDESCRIPTIONMODEL_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "phonondefs.h"		#include "phonondefs.h"
	#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_NAMESPACE
	#ifndef QT_NO_PHONON_OBJECTDESCRIPTIONMODEL		#ifndef QT_NO_PHONON_OBJECTDESCRIPTIONMODEL
	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.
	*		*
	skipping to change at line 384		skipping to change at line 381
	typedef ObjectDescriptionModel<VideoOutputDeviceType> VideoOutputDevice Model;		typedef ObjectDescriptionModel<VideoOutputDeviceType> VideoOutputDevice Model;
	typedef ObjectDescriptionModel<AudioCodecType> AudioCodecDescriptionMod el;		typedef ObjectDescriptionModel<AudioCodecType> AudioCodecDescriptionMod el;
	typedef ObjectDescriptionModel<VideoCodecType> VideoCodecDescriptionMod el;		typedef ObjectDescriptionModel<VideoCodecType> VideoCodecDescriptionMod el;
	typedef ObjectDescriptionModel<ContainerFormatType> ContainerFormatDesc riptionModel;		typedef ObjectDescriptionModel<ContainerFormatType> ContainerFormatDesc riptionModel;
	typedef ObjectDescriptionModel<VisualizationType> VisualizationDescript ionModel;*/		typedef ObjectDescriptionModel<VisualizationType> VisualizationDescript ionModel;*/
	}		}
	#endif //QT_NO_PHONON_OBJECTDESCRIPTIONMODEL		#endif //QT_NO_PHONON_OBJECTDESCRIPTIONMODEL
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_OBJECTDESCRIPTIONMODEL_H		#endif // PHONON_OBJECTDESCRIPTIONMODEL_H
	// vim: sw=4 ts=4 tw=80		// vim: sw=4 ts=4 tw=80
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	path.h		path.h
	skipping to change at line 31		skipping to change at line 31
	*/		*/
	#ifndef PHONON_PATH_H		#ifndef PHONON_PATH_H
	#define PHONON_PATH_H		#define PHONON_PATH_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "objectdescription.h"		#include "objectdescription.h"
	#include <QtCore/QExplicitlySharedDataPointer>		#include <QtCore/QExplicitlySharedDataPointer>
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	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
	skipping to change at line 239		skipping to change at line 236
	* MediaObject and AudioOutput will create a Path object connecting the aud io. This might be		* MediaObject and AudioOutput will create a Path object connecting the aud io. This might be
	* represented as PCM or perhaps even AC3 depending on the AudioOutput obje ct.		* represented as PCM or perhaps even AC3 depending on the AudioOutput obje ct.
	*		*
	* \param source The MediaNode to connect an output from		* \param source The MediaNode to connect an output from
	* \param sink The MediaNode to connect to.		* \param sink The MediaNode to connect to.
	*/		*/
	PHONON_EXPORT Path createPath(MediaNode *source, MediaNode *sink);		PHONON_EXPORT Path createPath(MediaNode *source, MediaNode *sink);
	} // namespace Phonon		} // namespace Phonon
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_PATH_H		#endif // PHONON_PATH_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	phonon_export.h		phonon_export.h
	skipping to change at line 52		skipping to change at line 52
	#endif		#endif
	#ifndef PHONON_DEPRECATED		#ifndef PHONON_DEPRECATED
	# define PHONON_DEPRECATED Q_DECL_DEPRECATED		# define PHONON_DEPRECATED Q_DECL_DEPRECATED
	#endif		#endif
	#ifndef PHONON_EXPORT_DEPRECATED		#ifndef PHONON_EXPORT_DEPRECATED
	# define PHONON_EXPORT_DEPRECATED Q_DECL_DEPRECATED PHONON_EXPORT		# define PHONON_EXPORT_DEPRECATED Q_DECL_DEPRECATED PHONON_EXPORT
	#endif		#endif
	// QT_(BEGIN|END)_NAMESPACE appeared in 4.4
	#ifndef QT_BEGIN_NAMESPACE
	# define QT_BEGIN_NAMESPACE
	#endif
	#ifndef QT_END_NAMESPACE
	# define QT_END_NAMESPACE
	#endif
	// silence syncqt
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif		#endif
End of changes. 1 change blocks.
	15 lines changed or deleted		0 lines changed or added

	phonondefs.h		phonondefs.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 PHONONDEFS_H		#ifndef PHONONDEFS_H
	#define PHONONDEFS_H		#define PHONONDEFS_H
	#include <QtCore/QtGlobal>		#include <QtCore/QtGlobal>
	#include "phonon_export.h"		#include "phonon_export.h"
	QT_BEGIN_HEADER		#ifdef PHONON_BACKEND_VERSION_4_7
	QT_BEGIN_NAMESPACE		# ifndef PHONON_BACKEND_VERSION_4_4
			# define PHONON_BACKEND_VERSION_4_4
			# endif
			#endif
	#ifdef PHONON_BACKEND_VERSION_4_4		#ifdef PHONON_BACKEND_VERSION_4_4
	# ifndef PHONON_BACKEND_VERSION_4_3		# ifndef PHONON_BACKEND_VERSION_4_3
	# define PHONON_BACKEND_VERSION_4_3		# define PHONON_BACKEND_VERSION_4_3
	# endif		# endif
	#endif		#endif
	#ifdef PHONON_BACKEND_VERSION_4_3		#ifdef PHONON_BACKEND_VERSION_4_3
	# ifndef PHONON_BACKEND_VERSION_4_2		# ifndef PHONON_BACKEND_VERSION_4_2
	# define PHONON_BACKEND_VERSION_4_2		# define PHONON_BACKEND_VERSION_4_2
	# endif		# endif
	#endif		#endif
	skipping to change at line 146		skipping to change at line 148
	* \see PHONON_ABSTRACTBASE		* \see PHONON_ABSTRACTBASE
	* \see PHONON_OBJECT		* \see PHONON_OBJECT
	*/		*/
	#define PHONON_HEIR(classname) \		#define PHONON_HEIR(classname) \
	public: \		public: \
	/**		/**
	* Constructs an object with the given \p parent.		* Constructs an object with the given \p parent.
	*/ \		*/ \
	classname(QObject *parent = 0); \		classname(QObject *parent = 0); \
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONONDEFS_H		#endif // PHONONDEFS_H
End of changes. 2 change blocks.
	6 lines changed or deleted		5 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, 6, 0)		#define PHONON_VERSION PHONON_VERSION_CHECK(4, 7, 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.6.0"		#define PHONON_VERSION_STR "4.7.0"
	QT_BEGIN_HEADER		/**
	QT_BEGIN_NAMESPACE		* Definitions to disable capture - should end up in the backends and
			* platform plugins, too
			*/
			/* #undef PHONON_NO_CAPTURE */
			#ifdef PHONON_NO_CAPTURE
			#define PHONON_NO_VIDEOCAPTURE
			#define PHONON_NO_AUDIOCAPTURE
			#endif
	class QString;		class QString;
	/**		/**
	* \brief The %KDE Multimedia classes		* \brief The %KDE Multimedia classes
	*		*
	* In this Namespace you find the classes to access Multimedia functions fo r		* In this Namespace you find the classes to access Multimedia functions fo r
	* audio and video playback. Those classes are not dependent		* audio and video playback. Those classes are not dependent
	* on any specific framework (like they were in pre KDE4 times) but rather use		* on any specific framework (like they were in pre KDE4 times) but rather use
	* exchangeable backends to do the work.		* exchangeable backends to do the work.
	skipping to change at line 73		skipping to change at line 80
	namespace Phonon		namespace Phonon
	{		{
	PHONON_EXPORT const char *phononVersion();		PHONON_EXPORT const char *phononVersion();
	/**		/**
	* Enum to identify the media discs supported by MediaObject.		* Enum to identify the media discs supported by MediaObject.
	*		*
	* \see MediaSource(Phonon::DiscType, const QString &deviceName)		* \see MediaSource(Phonon::DiscType, const QString &deviceName)
	*/		*/
	enum DiscType {		enum DiscType {
	/**		NoDisc = -1, /** < No disc was selected. Only used as default value
	* No disc was selected. This is only useful as a return value from		in
	* MediaSource::distType();		\class MediaSource */
	*/		Cd = 0, /** < Audio CD */
	NoDisc = -1,		Dvd = 1, /** < Video DVD (no arbitrary data DVDs) */
	/**		Vcd = 2, /** < Video CD */
	* Identifies Audio CDs.		BluRay = 3 /** < BluRay video disc \since 4.7.0 */
	*/
	Cd = 0,
	/**
	* Identifies DVDs (not arbitrary data DVDs, only movie DVDs).
	*/
	Dvd = 1,
	/**
	* Identifies Video CDs.
	*/
	Vcd = 2
	};		};
	/**		/**
	* Provided as keys for MediaObject::metaData for convenience, in addit ion to the strings defined in		* Provided as keys for MediaObject::metaData for convenience, in addit ion to the strings defined in
	* the Ogg Vorbis specification.		* the Ogg Vorbis specification.
	*/		*/
	enum MetaData {		enum MetaData {
	/**		/**
	* The artist generally considered responsible for the work. In pop ular		* The artist generally considered responsible for the work. In pop ular
	* music this is usually the performing band or singer. For classic al		* music this is usually the performing band or singer. For classic al
	skipping to change at line 307		skipping to change at line 303
	// TODO: naming		// TODO: naming
	/*enum MediaStreamType {		/*enum MediaStreamType {
	Audio = 1,		Audio = 1,
	Video = 2,		Video = 2,
	StillImage = 4,		StillImage = 4,
	Subtitle = 8,		Subtitle = 8,
	AllMedia = 0xFFFFFFFF		AllMedia = 0xFFFFFFFF
	};		};
	Q_DECLARE_FLAGS(MediaStreamTypes, MediaStreamType)*/		Q_DECLARE_FLAGS(MediaStreamTypes, MediaStreamType)*/
	} // namespace Phonon
	//Q_DECLARE_OPERATORS_FOR_FLAGS(Phonon::MediaStreamTypes)
	QT_END_NAMESPACE		PHONON_EXPORT QDebug operator <<(QDebug dbg, const Phonon::DiscType &);
			PHONON_EXPORT QDebug operator <<(QDebug dbg, const Phonon::MetaData &);
			PHONON_EXPORT QDebug operator <<(QDebug dbg, const Phonon::State &);
			PHONON_EXPORT QDebug operator <<(QDebug dbg, const Phonon::Category &);
			PHONON_EXPORT QDebug operator <<(QDebug dbg, const Phonon::CaptureCateg
			ory &);
			PHONON_EXPORT QDebug operator <<(QDebug dbg, const Phonon::Capture::Dev
			iceType &);
			PHONON_EXPORT QDebug operator <<(QDebug dbg, const Phonon::ErrorType &)
			;
	//X class kdbgstream;		} // namespace Phonon
	//X #include <kdebug.h>		//Q_DECLARE_OPERATORS_FOR_FLAGS(Phonon::MediaStreamTypes)
	//X /**
	//X * Implements needed operator to use Phonon::State with kDebug
	//X */
	//X inline PHONON_EXPORT kdbgstream &operator<<(kdbgstream & stream, const
	Phonon::State state)
	//X {
	//X switch(state)
	//X {
	//X case Phonon::ErrorState:
	//X stream << "ErrorState";
	//X break;
	//X case Phonon::LoadingState:
	//X stream << "LoadingState";
	//X break;
	//X case Phonon::StoppedState:
	//X stream << "StoppedState";
	//X break;
	//X case Phonon::PlayingState:
	//X stream << "PlayingState";
	//X break;
	//X case Phonon::BufferingState:
	//X stream << "BufferingState";
	//X break;
	//X case Phonon::PausedState:
	//X stream << "PausedState";
	//X break;
	//X }
	//X return stream;
	//X }
	#include <QtCore/QMetaType>		#include <QtCore/QMetaType>
	Q_DECLARE_METATYPE(Phonon::State)		Q_DECLARE_METATYPE(Phonon::State)
	Q_DECLARE_METATYPE(Phonon::ErrorType)		Q_DECLARE_METATYPE(Phonon::ErrorType)
	Q_DECLARE_METATYPE(Phonon::Category)		Q_DECLARE_METATYPE(Phonon::Category)
	Q_DECLARE_METATYPE(Phonon::CaptureCategory)		Q_DECLARE_METATYPE(Phonon::CaptureCategory)
	QT_END_HEADER
	// vim: sw=4 ts=4 tw=80		// vim: sw=4 ts=4 tw=80
	#endif // PHONONNAMESPACE_H		#endif // PHONONNAMESPACE_H
End of changes. 8 change blocks.
	57 lines changed or deleted		30 lines changed or added

	platformplugin.h		platformplugin.h
	skipping to change at line 32		skipping to change at line 32
	#ifndef PHONON_PLATFORMPLUGIN_H		#ifndef PHONON_PLATFORMPLUGIN_H
	#define PHONON_PLATFORMPLUGIN_H		#define PHONON_PLATFORMPLUGIN_H
	#include <QtCore/QObject>		#include <QtCore/QObject>
	#include <QtCore/QStringList>		#include <QtCore/QStringList>
	#include <QtCore/QPair>		#include <QtCore/QPair>
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "objectdescription.h"		#include "objectdescription.h"
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	#ifndef QT_NO_PHONON_PLATFORMPLUGIN		#ifndef QT_NO_PHONON_PLATFORMPLUGIN
	class QUrl;		class QUrl;
	class QObject;		class QObject;
	class QIcon;		class QIcon;
	namespace Phonon		namespace Phonon
	{		{
	class AbstractMediaStream;		class AbstractMediaStream;
	skipping to change at line 132		skipping to change at line 129
	*/		*/
	virtual DeviceAccessList deviceAccessListFor(const VideoCaptureDevi ce &) const { return DeviceAccessList(); }		virtual DeviceAccessList deviceAccessListFor(const VideoCaptureDevi ce &) const { return DeviceAccessList(); }
	#endif // PHONON_NO_VIDEOCAPTURE		#endif // PHONON_NO_VIDEOCAPTURE
	};		};
	} // namespace Phonon		} // namespace Phonon
	Q_DECLARE_INTERFACE(Phonon::PlatformPlugin, "3PlatformPlugin.phonon.kde.org ")		Q_DECLARE_INTERFACE(Phonon::PlatformPlugin, "3PlatformPlugin.phonon.kde.org ")
	#endif //QT_NO_PHONON_PLATFORMPLUGIN		#endif //QT_NO_PHONON_PLATFORMPLUGIN
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_PLATFORMPLUGIN_H		#endif // PHONON_PLATFORMPLUGIN_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	pulsesupport.h		pulsesupport.h
	skipping to change at line 33		skipping to change at line 33
	#ifndef PHONON_PULSESUPPORT_H		#ifndef PHONON_PULSESUPPORT_H
	#define PHONON_PULSESUPPORT_H		#define PHONON_PULSESUPPORT_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "phononnamespace.h"		#include "phononnamespace.h"
	#include "objectdescription.h"		#include "objectdescription.h"
	#include <QtCore/QtGlobal>		#include <QtCore/QtGlobal>
	#include <QtCore/QSet>		#include <QtCore/QSet>
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	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();		static PulseSupport* getInstance();
	static void shutdown();		static void shutdown();
	skipping to change at line 61		skipping to change at line 58
	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;
	void setOutputDevicePriorityForCategory(Category category, QLis t<int> order);		void setOutputDevicePriorityForCategory(Category category, QLis t<int> order);
	void setCaptureDevicePriorityForCategory(CaptureCategory catego ry, QList<int> order);		void setCaptureDevicePriorityForCategory(CaptureCategory catego ry, QList<int> order);
	PHONON_DEPRECATED void setCaptureDevicePriorityForCategory(Cate gory category, QList<int> order);		PHONON_DEPRECATED void setCaptureDevicePriorityForCategory(Cate gory category, QList<int> order);
	PulseStream *registerOutputStream(QString streamUuid, Category category);		PulseStream *registerOutputStream(QString streamUuid, Category category);
	PulseStream *registerCaptureStream(QString streamUuid, CaptureC ategory category);		PulseStream *registerCaptureStream(QString streamUuid, CaptureC ategory category);
	PHONON_DEPRECATED PulseStream *registerCaptureStream(QString st reamUuid, Category category);		PHONON_DEPRECATED PulseStream *registerCaptureStream(QString st reamUuid, Category category);
			/**
			* Whenever possible this function should be used to get Phonon
			* specific PulseAudio stream properties and set them on specif
			ic
			* streams. When precisely setting them per stream is not possi
			ble
			* the envrionment setup function PulseSupport::setupStreamEnvi
			ronment
			* should be called as close to stream creation as possible. Th
			e
			* more time passes between setup and stream creation the more
			* likely race conditions between setup of more than one AudioO
			utput
			* will appear.
			*
			* \param streamUuid the AudioOutputs' stream UUID set by the f
			rontend through
			* AudioOutputInterface47::setStreamUuid
			*
			* \returns a hash of all properties set by setupStreamEnvironm
			ent
			*
			* \see setupStreamEnvironment
			* \since 4.7.0
			*/
			QHash<QString, QString> streamProperties(QString streamUuid) co
			nst;
			/**
			* Sets PulseAudio override properties in the process' envrionm
			ent.
			* Manually setting the properties on a per-stream basis is
			* preferred as envrionment overrides are subject to race condi
			tions
			* when creating more than one stream around the same time.
			*
			* \param streamUuid the AudioOutputs' stream UUID set by the f
			rontend
			* through AudioOutputInterface47::setStreamU
			uid
			*
			* \see streamProperties
			* \since 4.7.0
			*/
			void setupStreamEnvironment(QString streamUuid);
	void emitObjectDescriptionChanged(ObjectDescriptionType);		void emitObjectDescriptionChanged(ObjectDescriptionType);
	bool setOutputName(QString streamUuid, QString name);		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 setOutputVolume(QString streamUuid, qreal volume);
	bool setOutputMute(QString streamUuid, bool mute);		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		// NB Capture Volume/Mute not set until PA supports per-source- output volumes/mutes
	// or phonon supports capture properly... which ever comes f irst.		// or phonon supports capture properly... which ever comes f irst.
	void clearStreamCache(QString streamUuid);		void clearStreamCache(QString streamUuid);
	skipping to change at line 90		skipping to change at line 120
	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_HEADER
	#endif // PHONON_PULSESUPPORT_H		#endif // PHONON_PULSESUPPORT_H
End of changes. 4 change blocks.
	7 lines changed or deleted		46 lines changed or added

	seekslider.h		seekslider.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_UI_SEEKSLIDER_H		#ifndef PHONON_UI_SEEKSLIDER_H
	#define PHONON_UI_SEEKSLIDER_H		#define PHONON_UI_SEEKSLIDER_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "phonondefs.h"		#include "phonondefs.h"
	#include "phononnamespace.h"		#include "phononnamespace.h"
	#include <QtGui/QWidget>		#include <QWidget>
	QT_BEGIN_HEADER
	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
	skipping to change at line 153		skipping to change at line 150
	Q_PRIVATE_SLOT(k_func(), void _k_tick(qint64))		Q_PRIVATE_SLOT(k_func(), void _k_tick(qint64))
	Q_PRIVATE_SLOT(k_func(), void _k_length(qint64))		Q_PRIVATE_SLOT(k_func(), void _k_length(qint64))
	Q_PRIVATE_SLOT(k_func(), void _k_seekableChanged(bool))		Q_PRIVATE_SLOT(k_func(), void _k_seekableChanged(bool))
	Q_PRIVATE_SLOT(k_func(), void _k_currentSourceChanged())		Q_PRIVATE_SLOT(k_func(), void _k_currentSourceChanged())
	};		};
	} // namespace Phonon		} // namespace Phonon
	#endif //QT_NO_PHONON_SEEKSLIDER		#endif //QT_NO_PHONON_SEEKSLIDER
	QT_END_NAMESPACE
	QT_END_HEADER
	// vim: sw=4 ts=4 tw=80		// vim: sw=4 ts=4 tw=80
	#endif // PHONON_UI_SEEKSLIDER_H		#endif // PHONON_UI_SEEKSLIDER_H
End of changes. 2 change blocks.
	7 lines changed or deleted		1 lines changed or added

	streaminterface.h		streaminterface.h
	skipping to change at line 29		skipping to change at line 29
	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_STREAMINTERFACE_H		#ifndef PHONON_STREAMINTERFACE_H
	#define PHONON_STREAMINTERFACE_H		#define PHONON_STREAMINTERFACE_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include <QtCore/QObject>		#include <QtCore/QObject>
	QT_BEGIN_HEADER
	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).
	*		*
	skipping to change at line 138		skipping to change at line 135
	StreamInterface();		StreamInterface();
	StreamInterfacePrivate *const d;		StreamInterfacePrivate *const d;
	};		};
	} // namespace Phonon		} // namespace Phonon
	Q_DECLARE_INTERFACE(Phonon::StreamInterface, "StreamInterface1.phonon.kde.o rg")		Q_DECLARE_INTERFACE(Phonon::StreamInterface, "StreamInterface1.phonon.kde.o rg")
	#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM		#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_STREAMINTERFACE_H		#endif // PHONON_STREAMINTERFACE_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	videoframe2.h		videoframe2.h
	skipping to change at line 28		skipping to change at line 28
	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_EXPERIMENTAL_VIDEOFRAME2_H		#ifndef PHONON_EXPERIMENTAL_VIDEOFRAME2_H
	#define PHONON_EXPERIMENTAL_VIDEOFRAME2_H		#define PHONON_EXPERIMENTAL_VIDEOFRAME2_H
	#include "export.h"		#include "export.h"
	#include "videodataoutput.h"		#include "videodataoutput.h"
	#include <QtGui/QImage>		#include <QImage>
	#include <QtCore/QByteRef>		#include <QtCore/QByteRef>
	namespace Phonon		namespace Phonon
	{		{
	namespace Experimental		namespace Experimental
	{		{
	/**		/**
	* \brief A single video frame.		* \brief A single video frame.
	*		*
	* This simple class contains the data of a frame and metadata describi ng		* This simple class contains the data of a frame and metadata describi ng
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 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_VIDEOPLAYER_H		#ifndef Phonon_VIDEOPLAYER_H
	#define Phonon_VIDEOPLAYER_H		#define Phonon_VIDEOPLAYER_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "phononnamespace.h"		#include "phononnamespace.h"
	#include "mediasource.h"		#include "mediasource.h"
	#include <QtGui/QWidget>		#include <QWidget>
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	#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;
	skipping to change at line 204		skipping to change at line 201
	protected:		protected:
	bool event(QEvent *);		bool event(QEvent *);
	VideoPlayerPrivate *const d;		VideoPlayerPrivate *const d;
	};		};
	} //namespace Phonon		} //namespace Phonon
	#endif //QT_NO_PHONON_VIDEOPLAYER		#endif //QT_NO_PHONON_VIDEOPLAYER
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // Phonon_VIDEOPLAYER_H		#endif // Phonon_VIDEOPLAYER_H
	// vim: sw=4 ts=4 tw=80		// vim: sw=4 ts=4 tw=80
End of changes. 2 change blocks.
	7 lines changed or deleted		1 lines changed or added

	videowidget.h		videowidget.h
	skipping to change at line 28		skipping to change at line 28
	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_VIDEOWIDGET_H		#ifndef Phonon_VIDEOWIDGET_H
	#define Phonon_VIDEOWIDGET_H		#define Phonon_VIDEOWIDGET_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "phonondefs.h"		#include "phonondefs.h"
	#include "abstractvideooutput.h"		#include "abstractvideooutput.h"
	#include <QtGui/QWidget>		#include <QWidget>
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	class QString;		class QString;
	#ifndef QT_NO_PHONON_VIDEO		#ifndef QT_NO_PHONON_VIDEO
	namespace Phonon		namespace Phonon
	{		{
	class AbstractVideoOutput;		class AbstractVideoOutput;
	class VideoWidgetPrivate;		class VideoWidgetPrivate;
	/** \class VideoWidget videowidget.h phonon/VideoWidget		/** \class VideoWidget videowidget.h phonon/VideoWidget
	skipping to change at line 216		skipping to change at line 213
	VideoWidget(VideoWidgetPrivate &d, QWidget *parent);		VideoWidget(VideoWidgetPrivate &d, QWidget *parent);
	void mouseMoveEvent(QMouseEvent *);		void mouseMoveEvent(QMouseEvent *);
	bool event(QEvent *);		bool event(QEvent *);
	};		};
	} //namespace Phonon		} //namespace Phonon
	#endif //QT_NO_PHONON_VIDEO		#endif //QT_NO_PHONON_VIDEO
	QT_END_NAMESPACE
	QT_END_HEADER
	// vim: sw=4 ts=4 tw=80		// vim: sw=4 ts=4 tw=80
	#endif // Phonon_VIDEOWIDGET_H		#endif // Phonon_VIDEOWIDGET_H
End of changes. 2 change blocks.
	7 lines changed or deleted		1 lines changed or added

	videowidgetinterface.h		videowidgetinterface.h
	skipping to change at line 28		skipping to change at line 28
	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_VIDEOWIDGETINTERFACE_H		#ifndef PHONON_VIDEOWIDGETINTERFACE_H
	#define PHONON_VIDEOWIDGETINTERFACE_H		#define PHONON_VIDEOWIDGETINTERFACE_H
	#include "videowidget.h"		#include "videowidget.h"
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	#ifndef QT_NO_PHONON_VIDEO		#ifndef QT_NO_PHONON_VIDEO
	namespace Phonon		namespace Phonon
	{		{
	class VideoWidgetInterface		class VideoWidgetInterface
	{		{
	public:		public:
	virtual ~VideoWidgetInterface() {}		virtual ~VideoWidgetInterface() {}
	virtual Phonon::VideoWidget::AspectRatio aspectRatio() const = 0;		virtual Phonon::VideoWidget::AspectRatio aspectRatio() const = 0;
	skipping to change at line 75		skipping to change at line 72
	namespace Phonon { typedef VideoWidgetInterface44 VideoWidgetInterfaceLates t; }		namespace Phonon { typedef VideoWidgetInterface44 VideoWidgetInterfaceLates t; }
	#else		#else
	namespace Phonon { typedef VideoWidgetInterface VideoWidgetInterfaceLatest; }		namespace Phonon { typedef VideoWidgetInterface VideoWidgetInterfaceLatest; }
	#endif		#endif
	Q_DECLARE_INTERFACE(Phonon::VideoWidgetInterface44, "VideoWidgetInterface44 .phonon.kde.org")		Q_DECLARE_INTERFACE(Phonon::VideoWidgetInterface44, "VideoWidgetInterface44 .phonon.kde.org")
	Q_DECLARE_INTERFACE(Phonon::VideoWidgetInterface, "VideoWidgetInterface3.ph onon.kde.org")		Q_DECLARE_INTERFACE(Phonon::VideoWidgetInterface, "VideoWidgetInterface3.ph onon.kde.org")
	#endif //QT_NO_PHONON_VIDEO		#endif //QT_NO_PHONON_VIDEO
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_VIDEOWIDGETINTERFACE_H		#endif // PHONON_VIDEOWIDGETINTERFACE_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	volumefadereffect.h		volumefadereffect.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_VOLUMEFADEREFFECT_H		#ifndef PHONON_VOLUMEFADEREFFECT_H
	#define PHONON_VOLUMEFADEREFFECT_H		#define PHONON_VOLUMEFADEREFFECT_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "effect.h"		#include "effect.h"
	QT_BEGIN_HEADER
	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
	skipping to change at line 174		skipping to change at line 171
	*		*
	* \see fadeIn		* \see fadeIn
	* \see fadeOut		* \see fadeOut
	*/		*/
	void fadeTo(float volume, int fadeTime);		void fadeTo(float volume, int fadeTime);
	};		};
	} //namespace Phonon		} //namespace Phonon
	#endif //QT_NO_PHONON_VOLUMEFADEREFFECT		#endif //QT_NO_PHONON_VOLUMEFADEREFFECT
	QT_END_NAMESPACE
	QT_END_HEADER
	// vim: sw=4 ts=4 tw=80		// vim: sw=4 ts=4 tw=80
	#endif // PHONON_VOLUMEFADEREFFECT_H		#endif // PHONON_VOLUMEFADEREFFECT_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	volumefaderinterface.h		volumefaderinterface.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_VOLUMEFADERINTERFACE_H		#ifndef PHONON_VOLUMEFADERINTERFACE_H
	#define PHONON_VOLUMEFADERINTERFACE_H		#define PHONON_VOLUMEFADERINTERFACE_H
	#include "volumefadereffect.h"		#include "volumefadereffect.h"
	#include <QtCore/QObject>		#include <QtCore/QObject>
	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE
	#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT		#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT
	namespace Phonon		namespace Phonon
	{		{
	class VolumeFaderInterface		class VolumeFaderInterface
	{		{
	public:		public:
	virtual ~VolumeFaderInterface() {}		virtual ~VolumeFaderInterface() {}
	virtual float volume() const { return 1.0; }		virtual float volume() const { return 1.0; }
	skipping to change at line 55		skipping to change at line 52
	}		}
	virtual void setFadeCurve(Phonon::VolumeFaderEffect::FadeCurve) {}		virtual void setFadeCurve(Phonon::VolumeFaderEffect::FadeCurve) {}
	virtual void fadeTo(float, int) {}		virtual void fadeTo(float, int) {}
	};		};
	}		}
	Q_DECLARE_INTERFACE(Phonon::VolumeFaderInterface, "VolumeFaderInterface4.ph onon.kde.org")		Q_DECLARE_INTERFACE(Phonon::VolumeFaderInterface, "VolumeFaderInterface4.ph onon.kde.org")
	#endif //QT_NO_PHONON_VOLUMEFADEREFFECT		#endif //QT_NO_PHONON_VOLUMEFADEREFFECT
	QT_END_NAMESPACE
	QT_END_HEADER
	#endif // PHONON_VOLUMEFADERINTERFACE_H		#endif // PHONON_VOLUMEFADERINTERFACE_H
End of changes. 2 change blocks.
	6 lines changed or deleted		0 lines changed or added

	volumeslider.h		volumeslider.h
	skipping to change at line 28		skipping to change at line 28
	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_UI_VOLUMESLIDER_H		#ifndef PHONON_UI_VOLUMESLIDER_H
	#define PHONON_UI_VOLUMESLIDER_H		#define PHONON_UI_VOLUMESLIDER_H
	#include "phonon_export.h"		#include "phonon_export.h"
	#include "phonondefs.h"		#include "phonondefs.h"
	#include <QtGui/QWidget>		#include <QWidget>
	QT_BEGIN_HEADER
	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 .
	skipping to change at line 151		skipping to change at line 148
	Q_PRIVATE_SLOT(k_ptr, void _k_sliderChanged(int))		Q_PRIVATE_SLOT(k_ptr, void _k_sliderChanged(int))
	Q_PRIVATE_SLOT(k_ptr, void _k_volumeChanged(qreal))		Q_PRIVATE_SLOT(k_ptr, void _k_volumeChanged(qreal))
	Q_PRIVATE_SLOT(k_ptr, void _k_mutedChanged(bool))		Q_PRIVATE_SLOT(k_ptr, void _k_mutedChanged(bool))
	Q_PRIVATE_SLOT(k_ptr, void _k_buttonClicked())		Q_PRIVATE_SLOT(k_ptr, void _k_buttonClicked())
	};		};
	} // namespace Phonon		} // namespace Phonon
	#endif //QT_NO_PHONON_VOLUMESLIDER		#endif //QT_NO_PHONON_VOLUMESLIDER
	QT_END_NAMESPACE
	QT_END_HEADER
	// vim: sw=4 ts=4 et		// vim: sw=4 ts=4 et
	#endif // PHONON_UI_VOLUMESLIDER_H		#endif // PHONON_UI_VOLUMESLIDER_H
End of changes. 2 change blocks.
	7 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/