phonon: headers diff between 4.2.0 and 4.3.0 versions

	abstractaudiooutput.h	abstractaudiooutput.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>	Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>


	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.


	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public License	You should have received a copy of the GNU Lesser General Public
	along with this library; see the file COPYING.LIB. If not, write to	License along with this library. If not, see <http://www.gnu.org/licen
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,	ses/>.
	Boston, MA 02110-1301, USA.

	*/	*/
	#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>


End of changes. 3 change blocks.
	11 lines changed or deleted	15 lines changed or added

	abstractmediastream.h	abstractmediastream.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	class QByteArray;	class QByteArray;


		#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM

	namespace Phonon	namespace Phonon
	{	{
	class MediaObject;	class MediaObject;
	class AbstractMediaStreamPrivate;	class AbstractMediaStreamPrivate;

	/** \class AbstractMediaStream abstractmediastream.h Phonon/AbstractMediaSt ream	/** \class AbstractMediaStream abstractmediastream.h Phonon/AbstractMediaSt ream
	* \brief Base class for custom media data streams.	* \brief Base class for custom media data streams.
	*	*
	* Implement this class to provide a custom data stream to the backend. The class supports both, the	* Implement this class to provide a custom data stream to the backend. The class supports both, the
	* push and the pull model.	* push and the pull model.

	skipping to change at line 217	skipping to change at line 222
	* \warning Do not call the parent implementation.	* \warning Do not call the parent implementation.
	*/	*/
	virtual void seekStream(qint64 offset);	virtual void seekStream(qint64 offset);

	AbstractMediaStream(AbstractMediaStreamPrivate &dd, QObject *parent );	AbstractMediaStream(AbstractMediaStreamPrivate &dd, QObject *parent );
	AbstractMediaStreamPrivate *d_ptr;	AbstractMediaStreamPrivate *d_ptr;
	};	};

	} // namespace Phonon	} // namespace Phonon


		#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	#endif // PHONON_ABSTRACTMEDIASTREAM_H	#endif // PHONON_ABSTRACTMEDIASTREAM_H

End of changes. 5 change blocks.
	8 lines changed or deleted	15 lines changed or added

	abstractvideooutput.h	abstractvideooutput.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>	Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/
	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_VIDEO

	class QString;	class QString;

	namespace Phonon	namespace Phonon
	{	{


	namespace Experimental	namespace Experimental
	{	{
	class Visualization;	class Visualization;
	class VisualizationPrivate;	class VisualizationPrivate;
	} // namespace Experimental	} // namespace Experimental

	class AbstractVideoOutputPrivate;	class AbstractVideoOutputPrivate;

	/** \class AbstractVideoOutput abstractvideooutput.h Phonon/AbstractVid eoOutput	/** \class AbstractVideoOutput abstractvideooutput.h Phonon/AbstractVid eoOutput
	* \brief Common base class for all video outputs.	* \brief Common base class for all video outputs.

	skipping to change at line 63	skipping to change at line 69
	/**	/**
	* \internal	* \internal
	* Constructor that is called from derived classes.	* Constructor that is called from derived classes.
	*	*
	* \param parent Standard QObject parent.	* \param parent Standard QObject parent.
	*/	*/
	AbstractVideoOutput(AbstractVideoOutputPrivate &d);	AbstractVideoOutput(AbstractVideoOutputPrivate &d);
	};	};
	} //namespace Phonon	} //namespace Phonon


		#endif //QT_NO_PHONON_VIDEO

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	#endif // Phonon_ABSTRACTVIDEOOUTPUTBASE_H	#endif // Phonon_ABSTRACTVIDEOOUTPUTBASE_H

End of changes. 6 change blocks.
	8 lines changed or deleted	16 lines changed or added

	addoninterface.h	addoninterface.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2007-2008 Matthias Kretz <kretz@kde.org>	Copyright (C) 2007-2008 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_MEDIACONTROLLER

	namespace Phonon	namespace Phonon
	{	{
	/** \class AddonInterface addoninterface.h Phonon/AddonInterface	/** \class AddonInterface addoninterface.h Phonon/AddonInterface
	* \short Interface for Menu, Chapter, Angle and Title/Track control.	* \short Interface for Menu, Chapter, Angle and Title/Track control.
	*	*
	* \author Matthias Kretz <kretz@kde.org>	* \author Matthias Kretz <kretz@kde.org>
	*/	*/
	class AddonInterface	class AddonInterface
	{	{
	public:	public:

	skipping to change at line 93	skipping to change at line 98
	virtual bool hasInterface(Interface iface) const = 0;	virtual bool hasInterface(Interface iface) const = 0;

	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

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	#endif // PHONON_ADDONINTERFACE_H	#endif // PHONON_ADDONINTERFACE_H

End of changes. 5 change blocks.
	8 lines changed or deleted	15 lines changed or added

	audiodataoutput.h	audiodataoutput.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>	Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/
	#ifndef Phonon_AUDIODATAOUTPUT_H	#ifndef Phonon_AUDIODATAOUTPUT_H
	#define Phonon_AUDIODATAOUTPUT_H	#define Phonon_AUDIODATAOUTPUT_H

	#include "export.h"	#include "export.h"
	#include "../abstractaudiooutput.h"	#include "../abstractaudiooutput.h"
	#include "../phonondefs.h"	#include "../phonondefs.h"

	#ifndef DOXYGEN_SHOULD_SKIP_THIS	#ifndef DOXYGEN_SHOULD_SKIP_THIS

End of changes. 3 change blocks.
	8 lines changed or deleted	11 lines changed or added

	audiooutput.h	audiooutput.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>	Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/
	#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"

End of changes. 3 change blocks.
	8 lines changed or deleted	11 lines changed or added

	audiooutputinterface.h	audiooutputinterface.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2007-2008 Matthias Kretz <kretz@kde.org>	Copyright (C) 2007-2008 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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 <QtCore/QtGlobal>	#include <QtCore/QtGlobal>

	QT_BEGIN_HEADER	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	namespace Phonon	namespace Phonon
	{	{
	/** \class AudioOutputInterface audiooutputinterface.h Phonon/AudioOutputIn terface	/** \class AudioOutputInterface audiooutputinterface.h Phonon/AudioOutputIn terface
	* \short Interface for AudioOutput objects	* \short Interface for AudioOutput objects
	*	*

		* The implementation can make use of the signals
		* \code
		void volumeChanged(qreal newVolume);
		void audioDeviceFailed();
		* \endcode
		* to notify the frontend whenever the volume has changed or when an audioD
		eviceFailed (e.g. USB
		* unplug or sound server failure).
		*
	* \author Matthias Kretz <kretz@kde.org>	* \author Matthias Kretz <kretz@kde.org>
	*/	*/
	class AudioOutputInterface40	class AudioOutputInterface40
	{	{
	public:	public:
	virtual ~AudioOutputInterface40() {}	virtual ~AudioOutputInterface40() {}

	/**	/**
	* Returns the current software volume.	* Returns the current software volume.
	*	*
	* A value of 0.0 means muted, 1.0 means unchanged, 2.0 means doubl e voltage (i.e. all	* A value of 0.0 means muted, 1.0 means unchanged, 2.0 means doubl e voltage (i.e. all
	* samples are multiplied by 2).	* samples are multiplied by 2).
	*/	*/
	virtual qreal volume() const = 0;	virtual qreal volume() const = 0;
	/**	/**
	* Sets the new current software volume.	* Sets the new current software volume.
	*	*
	* A value of 0.0 means muted, 1.0 means unchanged, 2.0 means doubl e voltage (i.e. all	* A value of 0.0 means muted, 1.0 means unchanged, 2.0 means doubl e voltage (i.e. all
	* samples are multiplied by 2).	* samples are multiplied by 2).

		*
		* Everytime the volume in the backend changes it should emit volum
		eChanged(qreal), also
		* inside this function.
	*/	*/
	virtual void setVolume(qreal) = 0;	virtual void setVolume(qreal) = 0;

	/**	/**
	* Returns the index of the device that is used. The index is the n umber returned from	* Returns the index of the device that is used. The index is the n umber returned from
	* BackendInterface::objectDescriptionIndexes(AudioOutputDeviceType ).	* BackendInterface::objectDescriptionIndexes(AudioOutputDeviceType ).
	*/	*/
	virtual int outputDevice() const = 0;	virtual int outputDevice() const = 0;
	/**	/**
	* \deprecated	* \deprecated

	skipping to change at line 88	skipping to change at line 103
	public:	public:
	/**	/**
	* Requests to change the current output device.	* Requests to change the current output device.
	*	*
	* \returns \c true if the requested device works and is used after this call.	* \returns \c true if the requested device works and is used after this call.
	* \returns \c false if something failed and the device is not used after this call.	* \returns \c false if something failed and the device is not used after this call.
	*/	*/
	virtual bool setOutputDevice(const Phonon::AudioOutputDevice &) = 0 ;	virtual bool setOutputDevice(const Phonon::AudioOutputDevice &) = 0 ;

	using AudioOutputInterface40::setOutputDevice;	using AudioOutputInterface40::setOutputDevice;


		/**
		* Helper function for backends to get a list of (driver, handle) p
		airs for
		* AudioOutputDevice objects that are listed by the platform plugin
		.
		*
		* Example:
		* \code
		typedef QPair<QByteArray, QString> PhononDeviceAccess;
		const QList<PhononDeviceAccess> &deviceAccessList = deviceAccess
		ListFor(deviceDesc);
		foreach (const PhononDeviceAccess &access, deviceAccessList) {
		const QByteArray &driver = access.first;
		const QString &handle = access.second;
		if (openDevice(driver, handle)) {
		// we found the first pair in the list that works. done.
		return;
		}
		// continue trying the other (driver, handle) pairs
		}
		// none of the (driver, handle) pairs worked, that means the who
		le AudioOutputDevice is
		// inaccessible and the frontend needs to know (either by emitti
		ng audioDeviceFailed or
		// returning false when called from setOutputDevice)
		* \endcode
		*
		* 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 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
		* separated by a newline character.
		* (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;
	};	};

	} // namespace Phonon	} // namespace Phonon

	#ifdef PHONON_BACKEND_VERSION_4_2	#ifdef 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")
	#else	#else
	namespace Phonon { typedef AudioOutputInterface40 AudioOutputInterface; }	namespace Phonon { typedef AudioOutputInterface40 AudioOutputInterface; }

End of changes. 7 change blocks.
	8 lines changed or deleted	66 lines changed or added

	backendcapabilities.h	backendcapabilities.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>	Copyright (C) 2005-2006 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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>

	skipping to change at line 76	skipping to change at line 79
	*/	*/
	void availableAudioOutputDevicesChanged();	void availableAudioOutputDevicesChanged();

	/**	/**
	* This signal is emitted when audio capture devices were plugg ed or	* This signal is emitted when audio capture devices were plugg ed or
	* unplugged.	* unplugged.
	*	*
	* Check BackendCapabilities::availableAudioCaptureDevices to g et the	* Check BackendCapabilities::availableAudioCaptureDevices to g et the
	* current list of available devices.	* current list of available devices.
	*/	*/

		#ifndef QT_NO_PHONON_AUDIOCAPTURE
	void availableAudioCaptureDevicesChanged();	void availableAudioCaptureDevicesChanged();

		#endif //QT_NO_PHONON_AUDIOCAPTURE
	};	};

	/**	/**
	* Use this function to get a QObject pointer to connect to the capabil itiesChanged signal.	* Use this function to get a QObject pointer to connect to the capabil itiesChanged signal.
	*	*
	* \return a pointer to a QObject.	* \return a pointer to a QObject.
	*	*
	* The capabilitiesChanged signal is emitted if the capabilities have c hanged. This can	* The capabilitiesChanged signal is emitted if the capabilities have c hanged. This can
	* happen if the user has requested a backend change.	* happen if the user has requested a backend change.
	*	*
	* To connect to this signal do the following:	* To connect to this signal do the following:
	* \code	* \code
	* QObject::connect(BackendCapabilities::notifier(), SIGNAL(capabilitie sChanged()), ...	* QObject::connect(BackendCapabilities::notifier(), SIGNAL(capabilitie sChanged()), ...
	* \endcode	* \endcode
	*	*
	* \see Notifier::capabilitiesChanged()	* \see Notifier::capabilitiesChanged()
	*/	*/
	PHONON_EXPORT Notifier *notifier();	PHONON_EXPORT Notifier *notifier();


	//X /**
	//X * Tells whether the backend is audio only or can handle video file
	s
	//X * and display of videos.
	//X *
	//X * If the backend does not support video all AbstractVideoOutput su
	bclasses won't
	//X * do anything.
	//X */
	//X PHONON_EXPORT bool supportsVideo();
	//X
	//X /**
	//X * Tells whether the backend implements the OSD interfaces.
	//X *
	//X * \todo there's no interfaces for it at this point
	//X */
	//X PHONON_EXPORT bool supportsOSD();
	//X
	//X /**
	//X * Tells whether the backend supports subtitle rendering on the
	//X * video output.
	//X *
	//X * \todo there's no interfaces for it at this point
	//X */
	//X PHONON_EXPORT bool supportsSubtitles();

	/**	/**
	* Returns a list of mime types that the Backend can decode.	* Returns a list of mime types that the Backend can decode.
	*	*
	* \see isMimeTypeAvailable()	* \see isMimeTypeAvailable()
	*/	*/
	PHONON_EXPORT QStringList availableMimeTypes();	PHONON_EXPORT QStringList availableMimeTypes();

	/**	/**
	* Often all you want to know is whether one given MIME type can be	* Often all you want to know is whether one given MIME type can be
	* decoded by the backend. Use this method in favor of availableMimeTyp es()	* decoded by the backend. Use this method in favor of availableMimeTyp es()
	* as it can give you a negative answer without having a backend loaded .	* as it can give you a negative answer without having a backend loaded .
	*	*
	* \see availableMimeTypes();	* \see availableMimeTypes();
	*/	*/
	PHONON_EXPORT bool isMimeTypeAvailable(const QString &mimeType);	PHONON_EXPORT bool isMimeTypeAvailable(const QString &mimeType);


	#if 0
	/**
	* Returns the audio output devices the backend reports as usable. That
	* doesn't have to say the device will certainly work as the backend
	* might not be able to open the device if it's blocked by another
	* application. But at least the device is physically available.
	*
	* \return A list of AudioOutputDevice objects that give a name and
	* description for every supported audio output device.
	*
	* \see knownAudioOutputDevices
	*/
	PHONON_EXPORT QList<AudioOutputDevice> usableAudioOutputDevices();

	/**
	* Returns the audio output devices the backend has ever reported as
	* usable.
	*
	* \return A list of AudioOutputDevice objects that give a name and
	* description for every supported audio output device.
	*
	* \see usableAudioOutputDevices
	*/
	PHONON_EXPORT QList<AudioOutputDevice> knownAudioOutputDevices();
	#endif
	/**	/**
	* Returns the audio output devices the backend supports.	* Returns the audio output devices the backend supports.
	*	*
	* \return A list of AudioOutputDevice objects that give a name and	* \return A list of AudioOutputDevice objects that give a name and
	* description for every supported audio output device.	* description for every supported audio output device.
	*/	*/
	PHONON_EXPORT QList<AudioOutputDevice> availableAudioOutputDevices();	PHONON_EXPORT QList<AudioOutputDevice> availableAudioOutputDevices();

	/**	/**
	* Returns the audio capture devices the backend supports.	* Returns the audio capture devices the backend supports.
	*	*
	* \return A list of AudioCaptureDevice objects that give a name and	* \return A list of AudioCaptureDevice objects that give a name and
	* description for every supported audio capture device.	* description for every supported audio capture device.
	*/	*/

		#ifndef QT_NO_PHONON_AUDIOCAPTURE
	PHONON_EXPORT QList<AudioCaptureDevice> availableAudioCaptureDevices();	PHONON_EXPORT QList<AudioCaptureDevice> availableAudioCaptureDevices();

		#endif //QT_NO_PHONON_AUDIOCAPTURE

	/**	/**
	* Returns the video output devices the backend supports.	* Returns the video output devices the backend supports.
	*	*
	* \return A list of VideoOutputDevice objects that give a name and	* \return A list of VideoOutputDevice objects that give a name and
	* description for every supported video output device.	* description for every supported video output device.
	*/	*/
	// PHONON_EXPORT QList<VideoOutputDevice> availableVideoOutputDevices();	// PHONON_EXPORT QList<VideoOutputDevice> availableVideoOutputDevices();

	/**	/**

	skipping to change at line 207	skipping to change at line 165
	* description for every supported visualization effect.	* description for every supported visualization effect.
	*/	*/
	// PHONON_EXPORT QList<VisualizationDescription> availableVisualizations ();	// PHONON_EXPORT QList<VisualizationDescription> availableVisualizations ();

	/**	/**
	* Returns descriptions for the audio effects the backend supports.	* Returns descriptions for the audio effects the backend supports.
	*	*
	* \return A list of AudioEffectDescription objects that give a name an d	* \return A list of AudioEffectDescription objects that give a name an d
	* description for every supported audio effect.	* description for every supported audio effect.
	*/	*/

		#ifndef QT_NO_PHONON_EFFECT
	PHONON_EXPORT QList<EffectDescription> availableAudioEffects();	PHONON_EXPORT QList<EffectDescription> availableAudioEffects();

		#endif //QT_NO_PHONON_EFFECT

	//X /**	//X /**
	//X * Returns descriptions for the video effects the backend supports.	//X * Returns descriptions for the video effects the backend supports.
	//X *	//X *
	//X * \return A list of VideoEffectDescription objects that give a nam e and	//X * \return A list of VideoEffectDescription objects that give a nam e and
	//X * description for every supported video effect.	//X * description for every supported video effect.
	//X */	//X */
	//X PHONON_EXPORT QList<EffectDescription> availableVideoEffects();	//X PHONON_EXPORT QList<EffectDescription> availableVideoEffects();

	/**	/**

End of changes. 11 change blocks.
	59 lines changed or deleted	17 lines changed or added

	backendinterface.h	backendinterface.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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>

End of changes. 3 change blocks.
	8 lines changed or deleted	11 lines changed or added

	effect.h	effect.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2005-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2005-2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/


	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE

	skipping to change at line 30	skipping to change at line 34
	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_EFFECT

	class QString;	class QString;
	template<class T> class QList;	template<class T> class QList;

	namespace Phonon	namespace Phonon
	{	{
	class EffectParameter;	class EffectParameter;
	class EffectPrivate;	class EffectPrivate;

	/** \class Effect effect.h Phonon/Effect	/** \class Effect effect.h Phonon/Effect
	* \short Effects that can be inserted into a Path.	* \short Effects that can be inserted into a Path.

	skipping to change at line 106	skipping to change at line 112
	QList<EffectParameter> parameters() const;	QList<EffectParameter> parameters() const;

	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

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	// vim: sw=4 ts=4 tw=80	// vim: sw=4 ts=4 tw=80
	#endif // PHONON_EFFECT_H	#endif // PHONON_EFFECT_H

End of changes. 6 change blocks.
	8 lines changed or deleted	16 lines changed or added

	effectinterface.h	effectinterface.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006-2008 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006-2008 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_EFFECT

	namespace Phonon	namespace Phonon
	{	{
	class EffectParameter;	class EffectParameter;
	/** \class EffectInterface effectinterface.h Phonon/EffectInterface	/** \class EffectInterface effectinterface.h Phonon/EffectInterface
	* \short Interface for Effect objects	* \short Interface for Effect objects
	*	*
	* \author Matthias Kretz <kretz@kde.org>	* \author Matthias Kretz <kretz@kde.org>
	*/	*/
	class EffectInterface	class EffectInterface
	{	{

	skipping to change at line 58	skipping to change at line 63
	virtual QVariant parameterValue(const EffectParameter &) const = 0;	virtual QVariant parameterValue(const EffectParameter &) const = 0;
	/**	/**
	* 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

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	#endif // PHONON_EFFECTINTERFACE_H	#endif // PHONON_EFFECTINTERFACE_H

End of changes. 5 change blocks.
	8 lines changed or deleted	15 lines changed or added

	effectparameter.h	effectparameter.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_EFFECT

	namespace Phonon	namespace Phonon
	{	{

	class Effect;	class Effect;
	class EffectParameterPrivate;	class EffectParameterPrivate;

	/** \class EffectParameter effectparameter.h Phonon/EffectParameter	/** \class EffectParameter effectparameter.h Phonon/EffectParameter
	* \brief This class describes one parameter of an effect.	* \brief This class describes one parameter of an effect.
	*	*
	* \ingroup PhononEffects	* \ingroup PhononEffects

	skipping to change at line 226	skipping to change at line 231

	} // 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::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

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	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. 5 change blocks.
	8 lines changed or deleted	15 lines changed or added

	effectwidget.h	effectwidget.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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 <QtGui/QWidget>

	QT_BEGIN_HEADER	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_EFFECTWIDGET

	namespace Phonon	namespace Phonon
	{	{
	class Effect;	class Effect;

	class EffectWidgetPrivate;	class EffectWidgetPrivate;

	/** \class EffectWidget effectwidget.h Phonon/EffectWidget	/** \class EffectWidget effectwidget.h Phonon/EffectWidget
	* \brief Widget to control the parameters of an \ref Effect.	* \brief Widget to control the parameters of an \ref Effect.
	*	*
	* \ingroup PhononWidgets	* \ingroup PhononWidgets

	skipping to change at line 60	skipping to change at line 65

	protected:	protected:
	//EffectWidget(EffectWidgetPrivate &dd, QWidget *parent);	//EffectWidget(EffectWidgetPrivate &dd, QWidget *parent);
	EffectWidgetPrivate *const k_ptr;	EffectWidgetPrivate *const k_ptr;

	private:	private:
	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))
	};	};
	} // namespace Phonon	} // namespace Phonon


		#endif //QT_NO_PHONON_EFFECTWIDGET

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	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. 6 change blocks.
	8 lines changed or deleted	16 lines changed or added

	export.h	export.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#ifndef PHONON_EXPERIMENTAL_EXPORT_H	#ifndef PHONON_EXPERIMENTAL_EXPORT_H
	#define PHONON_EXPERIMENTAL_EXPORT_H	#define PHONON_EXPERIMENTAL_EXPORT_H

	/* needed for KDE_EXPORT and KDE_IMPORT macros */	/* needed for KDE_EXPORT and KDE_IMPORT macros */
	#include <QtCore/QtGlobal>	#include <QtCore/QtGlobal>

	#ifndef PHONONEXPERIMENTAL_EXPORT	#ifndef PHONONEXPERIMENTAL_EXPORT

End of changes. 3 change blocks.
	8 lines changed or deleted	11 lines changed or added

	mediacontroller.h	mediacontroller.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_MEDIACONTROLLER

	namespace Phonon	namespace Phonon
	{	{
	class MediaControllerPrivate;	class MediaControllerPrivate;
	class MediaObject;	class MediaObject;

	/** \class MediaController mediacontroller.h Phonon/MediaController	/** \class MediaController mediacontroller.h Phonon/MediaController
	* \brief Controls optional features of a media file/device like title, cha pter, angle.	* \brief Controls optional features of a media file/device like title, cha pter, angle.
	*	*
	* \ingroup Playback	* \ingroup Playback
	* \author Matthias Kretz <kretz@kde.org>	* \author Matthias Kretz <kretz@kde.org>

	skipping to change at line 178	skipping to change at line 183
	void titleChanged(int titleNumber);	void titleChanged(int titleNumber);

	protected:	protected:
	MediaControllerPrivate *const d;	MediaControllerPrivate *const d;
	};	};

	} // namespace Phonon	} // namespace Phonon

	Q_DECLARE_OPERATORS_FOR_FLAGS(Phonon::MediaController::Features)	Q_DECLARE_OPERATORS_FOR_FLAGS(Phonon::MediaController::Features)


		#endif //QT_NO_PHONON_MEDIACONTROLLER

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	#endif // PHONON_MEDIACONTROLLER_H	#endif // PHONON_MEDIACONTROLLER_H

End of changes. 5 change blocks.
	8 lines changed or deleted	15 lines changed or added

	medianode.h	medianode.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>

	Copyright (C) 2007 Trolltech ASA. <thierry.bastian@trolltech.com>	Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). <thie rry.bastian@trolltech.com>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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"


End of changes. 4 change blocks.
	9 lines changed or deleted	12 lines changed or added

	mediaobject.h	mediaobject.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2005 Matthias Kretz <kretz@kde.org>	Copyright (C) 2005 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/
	#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"

	skipping to change at line 288	skipping to change at line 291
	*	*
	* \see setCurrentSource	* \see setCurrentSource
	*/	*/
	MediaSource currentSource() const;	MediaSource currentSource() const;

	/**	/**
	* Set the media source the MediaObject should use.	* Set the media source the MediaObject should use.
	*	*
	* \param source The MediaSource object to the media data. You can	* \param source The MediaSource object to the media data. You can
	* just as well use a QUrl or QString (for a local file) here.	* just as well use a QUrl or QString (for a local file) here.

		* Setting an empty (invalid) source, will stop and remove the
		* current source.
	*	*
	* \code	* \code
	* QUrl url("http://www.example.com/music.ogg");	* QUrl url("http://www.example.com/music.ogg");
	* media->setCurrentSource(url);	* media->setCurrentSource(url);
	* \endcode	* \endcode
	*	*
	* \see currentSource	* \see currentSource
	*/	*/
	void setCurrentSource(const MediaSource &source);	void setCurrentSource(const MediaSource &source);


	skipping to change at line 444	skipping to change at line 449
	*	*
	* \par Possible states right after this call:	* \par Possible states right after this call:
	* \li \ref BufferingState	* \li \ref BufferingState
	* \li \ref PlayingState	* \li \ref PlayingState
	* \li (\ref ErrorState)	* \li (\ref ErrorState)
	*	*
	* \see SeekSlider	* \see SeekSlider
	*/	*/
	void seek(qint64 time);	void seek(qint64 time);


		/**
		* Stops and removes all playing and enqueued media sources.
		*
		* \see setCurrentSource
		*/
		void clear();

	Q_SIGNALS:	Q_SIGNALS:
	/**	/**
	* Emitted when the state of the MediaObject has changed.	* Emitted when the state of the MediaObject has changed.
	* In case you're not interested in the old state you can also	* In case you're not interested in the old state you can also
	* connect to a slot that only has one \ref State argument.	* connect to a slot that only has one \ref State argument.
	*	*
	* @param newstate The state the Player is in now.	* @param newstate The state the Player is in now.
	* @param oldstate The state the Player was in before.	* @param oldstate The state the Player was in before.
	*/	*/
	void stateChanged(Phonon::State newstate, Phonon::State oldstat e);	void stateChanged(Phonon::State newstate, Phonon::State oldstat e);

	skipping to change at line 500	skipping to change at line 512
	* Normally you'll check hasVideo() first and then let this sig nal	* Normally you'll check hasVideo() first and then let this sig nal
	* tell you whether video is available now or not. That way you	* tell you whether video is available now or not. That way you
	* don't have to poll hasVideo().	* don't have to poll hasVideo().
	*	*
	* \param hasVideo \p true The stream contains video and addin g a	* \param hasVideo \p true The stream contains video and addin g a
	* VideoWidget will show a video.	* VideoWidget will show a video.
	* \p false There is no video data in the strea m and	* \p false There is no video data in the strea m and
	* adding a VideoWidget will show an e mpty (black)	* adding a VideoWidget will show an e mpty (black)
	* VideoWidget.	* VideoWidget.
	*/	*/

		#ifndef QT_NO_PHONON_VIDEO
	void hasVideoChanged(bool hasVideo);	void hasVideoChanged(bool hasVideo);

		#endif //QT_NO_PHONON_VIDEO

	/**	/**
	* Tells about the status of the buffer.	* Tells about the status of the buffer.
	*	*
	* You can use this signal to show a progress bar to the user w hen	* You can use this signal to show a progress bar to the user w hen
	* in BufferingState:	* in BufferingState:
	*	*
	* \code	* \code
	* progressBar->setRange(0, 100); // this is the default	* progressBar->setRange(0, 100); // this is the default
	* connect(media, SIGNAL(bufferStatus(int)), progressBar, SLOT( setValue(int)));	* connect(media, SIGNAL(bufferStatus(int)), progressBar, SLOT( setValue(int)));

	skipping to change at line 593	skipping to change at line 607
	*/	*/
	void totalTimeChanged(qint64 newTotalTime);	void totalTimeChanged(qint64 newTotalTime);

	protected:	protected:
	//MediaObject(Phonon::MediaObjectPrivate &dd, QObject *parent);	//MediaObject(Phonon::MediaObjectPrivate &dd, QObject *parent);

	private:	private:
	Q_PRIVATE_SLOT(k_func(), void _k_resumePlay())	Q_PRIVATE_SLOT(k_func(), void _k_resumePlay())
	Q_PRIVATE_SLOT(k_func(), void _k_resumePause())	Q_PRIVATE_SLOT(k_func(), void _k_resumePause())
	Q_PRIVATE_SLOT(k_func(), void _k_metaDataChanged(const QMultiMa p<QString, QString> &))	Q_PRIVATE_SLOT(k_func(), void _k_metaDataChanged(const QMultiMa p<QString, QString> &))

		#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM
	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))

		#endif //QT_NO_PHONON_ABSTRACTMEDIASTREAM
	Q_PRIVATE_SLOT(k_func(), void _k_aboutToFinish())	Q_PRIVATE_SLOT(k_func(), void _k_aboutToFinish())
	Q_PRIVATE_SLOT(k_func(), void _k_currentSourceChanged(const Med iaSource &))	Q_PRIVATE_SLOT(k_func(), void _k_currentSourceChanged(const Med iaSource &))
	};	};

	/**	/**
	* 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

End of changes. 9 change blocks.
	8 lines changed or deleted	24 lines changed or added

	mediaobjectinterface.h	mediaobjectinterface.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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_HEADER

End of changes. 3 change blocks.
	8 lines changed or deleted	11 lines changed or added

	mediasource.h	mediasource.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2008 Matthias Kretz <kretz@kde.org>	Copyright (C) 2008 Matthias Kretz <kretz@kde.org>


	This program is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License as published by the Free Software Foundation; either	License as published by the Free Software Foundation; either

	version 2 of the License, or (at your option) version 3.	version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#ifndef PHONON_EXPERIMENTAL_MEDIASOURCE_H	#ifndef PHONON_EXPERIMENTAL_MEDIASOURCE_H
	#define PHONON_EXPERIMENTAL_MEDIASOURCE_H	#define PHONON_EXPERIMENTAL_MEDIASOURCE_H

	#include "../mediasource.h"	#include "../mediasource.h"
	#include "export.h"	#include "export.h"
	#include "objectdescription.h"	#include "objectdescription.h"


End of changes. 4 change blocks.
	9 lines changed or deleted	11 lines changed or added

	objectdescription.h	objectdescription.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2008 Matthias Kretz <kretz@kde.org>	Copyright (C) 2008 Matthias Kretz <kretz@kde.org>


	This program is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or
	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License as published by the Free Software Foundation; either	License as published by the Free Software Foundation; either

	version 2 of the License, or (at your option) version 3.	version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/
	#ifndef PHONON_EXPERIMENTAL_OBJECTDESCRIPTION_H	#ifndef PHONON_EXPERIMENTAL_OBJECTDESCRIPTION_H
	#define PHONON_EXPERIMENTAL_OBJECTDESCRIPTION_H	#define PHONON_EXPERIMENTAL_OBJECTDESCRIPTION_H

	#include "../objectdescription.h"	#include "../objectdescription.h"

	namespace Phonon	namespace Phonon
	{	{
	namespace Experimental	namespace Experimental

End of changes. 4 change blocks.
	9 lines changed or deleted	11 lines changed or added

	objectdescriptionmodel.h	objectdescriptionmodel.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_OBJECTDESCRIPTIONMODEL

	/* MinGW 3.4.x gives an ICE when trying to instantiate one of the	/* MinGW 3.4.x gives an ICE when trying to instantiate one of the
	ObjectDescriptionModel<foo> classes because it can't handle	ObjectDescriptionModel<foo> classes because it can't handle
	half exported classes correct. gcc 4.3.x has a fix for this but	half exported classes correct. gcc 4.3.x has a fix for this but
	we currently there's no official gcc 4.3 on windows available.	we currently there's no official gcc 4.3 on windows available.
	Because of this we need this little hack	Because of this we need this little hack
	*/	*/
	#if defined(Q_CC_MINGW)	#if defined(Q_CC_MINGW)
	#define PHONON_EXPORT_ODM	#define PHONON_EXPORT_ODM
	#else	#else
	#define PHONON_EXPORT_ODM PHONON_EXPORT	#define PHONON_EXPORT_ODM PHONON_EXPORT

	skipping to change at line 372	skipping to change at line 377
	/*	/*
	typedef ObjectDescriptionModel<VideoOutputDeviceType> VideoOutputDevice Model;	typedef ObjectDescriptionModel<VideoOutputDeviceType> VideoOutputDevice Model;
	typedef ObjectDescriptionModel<VideoCaptureDeviceType> VideoCaptureDevi ceModel;	typedef ObjectDescriptionModel<VideoCaptureDeviceType> VideoCaptureDevi ceModel;
	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

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	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. 5 change blocks.
	8 lines changed or deleted	15 lines changed or added

	path.h	path.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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>

	skipping to change at line 99	skipping to change at line 102

	/**	/**
	* Returns whether the path object connects two MediaNodes or not.	* Returns whether the path object connects two MediaNodes or not.
	*	*
	* \return \p true when the path connects two MediaNodes	* \return \p true when the path connects two MediaNodes
	* \return \p false when the path is disconnected	* \return \p false when the path is disconnected
	*/	*/
	bool isValid() const;	bool isValid() const;
	//MediaStreamTypes mediaStreamTypes() const;	//MediaStreamTypes mediaStreamTypes() const;


		#ifndef QT_NO_PHONON_EFFECT
	/**	/**
	* Creates and inserts an effect into the path.	* Creates and inserts an effect into the path.
	*	*
	* You may insert effects of the same class as often as you like,	* You may insert effects of the same class as often as you like,
	* but if you insert the same object, the call will fail.	* but if you insert the same object, the call will fail.
	*	*
	* \param desc The EffectDescription object for the effect to be in serted.	* \param desc The EffectDescription object for the effect to be in serted.
	*	*
	* \param insertBefore If you already inserted an effect you can	* \param insertBefore If you already inserted an effect you can
	* tell with this parameter in which order the data gets	* tell with this parameter in which order the data gets

	skipping to change at line 173	skipping to change at line 177
	* Returns a list of Effect objects that are currently	* Returns a list of Effect objects that are currently
	* used as effects. The order in the list determines the order the	* used as effects. The order in the list determines the order the
	* signal is sent through the effects.	* signal is sent through the effects.
	*	*
	* \return A list with all current effects.	* \return A list with all current effects.
	*	*
	* \see insertEffect	* \see insertEffect
	* \see removeEffect	* \see removeEffect
	*/	*/
	QList<Effect *> effects() const;	QList<Effect *> effects() const;

		#endif //QT_NO_PHONON_EFFECT

	/**	/**
	* Tries to change the MediaNodes the path is connected to.	* Tries to change the MediaNodes the path is connected to.
	*	*
	* If reconnect fails the old connection is kept.	* If reconnect fails the old connection is kept.
	*/	*/
	bool reconnect(MediaNode source, MediaNode sink);	bool reconnect(MediaNode source, MediaNode sink);

	/**	/**
	* Disconnects the path from the MediaNodes it was connected to. Th is invalidates the path	* Disconnects the path from the MediaNodes it was connected to. Th is invalidates the path

	skipping to change at line 204	skipping to change at line 209
	/**	/**
	* Returns \p true if this Path is equal to \p p; otherwise returns \p false;	* Returns \p true if this Path is equal to \p p; otherwise returns \p false;
	*/	*/
	bool operator==(const Path &p) const;	bool operator==(const Path &p) const;

	/**	/**
	* Returns \p true if this Path is not equal to \p p; otherwise ret urns \p false;	* Returns \p true if this Path is not equal to \p p; otherwise ret urns \p false;
	*/	*/
	bool operator!=(const Path &p) const;	bool operator!=(const Path &p) const;


		/**
		* Returns the source MediaNode used by the path.
		*/
		MediaNode *source() const;

		/**
		* Returns the sink MediaNode used by the path.
		*/
		MediaNode *sink() const;

	protected:	protected:
	friend class PathPrivate;	friend class PathPrivate;
	QExplicitlySharedDataPointer<PathPrivate> d;	QExplicitlySharedDataPointer<PathPrivate> d;
	};	};

	/**	/**
	* \relates Path	* \relates Path
	* Creates a new Path connecting two MediaNodes.	* Creates a new Path connecting two MediaNodes.
	*	*
	* The implementation will automatically select the right format and media type. E.g. connecting a	* The implementation will automatically select the right format and media type. E.g. connecting a

End of changes. 6 change blocks.
	8 lines changed or deleted	23 lines changed or added

	phonon_export.h	phonon_export.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License as published by the Free Software Foundation; either	License as published by the Free Software Foundation; either

	version 2 of the License, or (at your option) any later version.	version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.
	*/	*/

	#ifndef PHONON_EXPORT_H	#ifndef PHONON_EXPORT_H
	#define PHONON_EXPORT_H	#define PHONON_EXPORT_H

	#include <QtCore/QtGlobal>	#include <QtCore/QtGlobal>

	#ifndef PHONON_EXPORT	#ifndef PHONON_EXPORT
	# if defined Q_WS_WIN	# if defined Q_WS_WIN
	# ifdef MAKE_PHONON_LIB /* We are building this library */	# ifdef MAKE_PHONON_LIB /* We are building this library */

End of changes. 4 change blocks.
	8 lines changed or deleted	10 lines changed or added

	phonondefs.h	phonondefs.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifdef PHONON_BACKEND_VERSION_4_3
		# ifndef PHONON_BACKEND_VERSION_4_2
		# define PHONON_BACKEND_VERSION_4_2
		# endif
		#endif

	// the following inlines are correct - exclude per line doesn't work for mu ltiline-macros so exclude	// the following inlines are correct - exclude per line doesn't work for mu ltiline-macros so exclude
	// the whole file for inline checks	// the whole file for inline checks
	//krazy:excludeall=inline	//krazy:excludeall=inline
	#define K_DECLARE_PRIVATE(Class) \	#define K_DECLARE_PRIVATE(Class) \
	inline Class##Private* k_func() { return reinterpret_cast<Class##Privat e *>(k_ptr); } \	inline Class##Private* k_func() { return reinterpret_cast<Class##Privat e *>(k_ptr); } \
	inline const Class##Private* k_func() const { return reinterpret_cast<c onst Class##Private *>(k_ptr); } \	inline const Class##Private* k_func() const { return reinterpret_cast<c onst Class##Private *>(k_ptr); } \
	friend class Class##Private;	friend class Class##Private;

	/**	/**
	* \internal	* \internal

End of changes. 4 change blocks.
	8 lines changed or deleted	17 lines changed or added

	phononnamespace.h	phononnamespace.h
	/* This file is part of the KDE project	/* This file is part of the KDE project

	Copyright (C) 2005-2008 Matthias Kretz <kretz@kde.org>	Copyright (C) 2008 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/


	#ifndef PHONONNAMESPACE_H	#ifndef PHONON_X_PHONONNAMESPACE_H
	#define PHONONNAMESPACE_H	#define PHONON_X_PHONONNAMESPACE_H

	#include "phonon_export.h"

	/**
	* Helper macro that can be used like
	* \code
	* #if (PHONON_VERSION >= PHONON_VERSION_CHECK(4, 4, 0))
	* \endcode
	*/
	#define PHONON_VERSION_CHECK(major, minor, patch) ((major<<16)\|(minor<<8)\|(
	patch))

	/**
	* PHONON_VERSION is (major << 16) + (minor << 8) + patch.
	*/
	#define PHONON_VERSION PHONON_VERSION_CHECK(4, 2, 0)

	/**
	* PHONON_VERSION_STR is "major.minor.patch". E.g. "4.2.1"
	*/
	#define PHONON_VERSION_STR "4.2.0"

	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE


	class QString;	#include "../phononnamespace.h"


	/**
	* \brief The %KDE Multimedia classes
	*
	* In this Namespace you find the classes to access Multimedia functions fo
	r
	* audio and video playback. Those classes are not dependent
	* on any specific framework (like they were in pre KDE4 times) but rather
	use
	* exchangeable backends to do the work.
	*
	* If you want to write a new backend take a look at \ref phonon_backend_de
	velopment_page.
	*
	* \author Matthias Kretz <kretz@kde.org>
	*/
	namespace Phonon	namespace Phonon
	{	{

	PHONON_EXPORT const char *phononVersion();	namespace Experimental
		{
	/**
	* Enum to identify the media discs supported by MediaObject.
	*
	* \see MediaSource(Phonon::DiscType, const QString &deviceName)
	*/
	enum DiscType {
	/**
	* No disc was selected. This is only useful as a return value from
	* MediaSource::distType();
	*/
	NoDisc = -1,
	/**
	* Identifies Audio CDs.
	*/
	Cd = 0,
	/**
	* Identifies DVDs (not arbitrary data DVDs, only movie DVDs).
	*/
	Dvd = 1,
	/**
	* Identifies Video CDs.
	*/
	Vcd = 2
	};

	/**
	* Provided as keys for \ref MediaObject::metaData for convenience, in
	addition to the strings defined in
	* the Ogg Vorbis specification.
	*/
	enum MetaData {
	ArtistMetaData,
	AlbumMetaData,
	TitleMetaData,
	DateMetaData,
	GenreMetaData,
	TracknumberMetaData,
	DescriptionMetaData,
	MusicBrainzDiscIdMetaData
	};

	/**
	* The state the media producing object is in at the moment.
	*
	* \see MediaObject
	*/
	enum State
	{
	/**
	* After construction it might take a while before the Player is
	* ready to play(). Normally this doesn't happen for local
	* files, but can happen for remote files where the asynchronous
	* mimetype detection and prebuffering can take a while.
	*/
	LoadingState,
	/**
	* The Player has a valid media file loaded and is ready for
	* playing.
	*/
	StoppedState,
	/**
	* The Player is playing a media file.
	*/
	PlayingState,
	/**
	* The Player is waiting for data to be able to continue
	* playing.
	*/
	BufferingState,
	/**
	* The Player is currently paused.
	*/
	PausedState,
	/**
	* An unrecoverable error occurred. The Object is unusable in this
	state.
	*/
	ErrorState
	};


	/**	enum BitRate {
	* Set's the category your program should be listed in in the mixer.	UnknownBitRate = -1,
	*
	* A Jukebox will set this to Music, a VoIP program to Communication, a
	* DVD player to video, and so on.
	*
	* \note These categories can also become useful for an application tha
	t
	* controls the volumes automatically, like turning down the music when
	a call
	* comes in, or turning down the notifications when the media player kn
	ows
	* it's playing classical music.
	*
	* \see AudioOutput::setCategory
	*/
	enum Category
	{
	/**
	* Will make use of the default device.
	*/
	NoCategory = -1,
	/**
	* If the sounds produced are notifications (bing, beep and such) y
	ou
	* should use this category.
	*/
	NotificationCategory = 0,
	/**
	* If your application is a music player (like a jukebox or media p
	layer
	* playing an audio file).
	*/
	MusicCategory = 1,
	/**
	* If the sound is the audio channel of a video.
	*/
	VideoCategory = 2,
	/**
	* If your applications produces sounds from communication with som
	ebody
	* else (VoIP, voice chat).
	*/
	CommunicationCategory = 3,
	/**	/**

	* Sound produced by a computer game should go into this category.	* Audio Data is transported as values from -128 to 127.
	*/	*/

	GameCategory = 4,	Signed8Bit = 100,
	/**	/**

	* Sounds produced for accessibility (e.g. Text-To-Speech)	* Audio Data is transported as values from 0 to 255
	*/	*/

	AccessibilityCategory = 5,	Unsigned8Bit = 200,
	/**	/**

	* \internal	* Audio Data is transported as values from -2^15 to 2^15-1
	* Holds the largest value of categories.
	*/	*/

	LastCategory = AccessibilityCategory	Signed16Bit = 300,
	};	Signed18Bit = 400,
		Signed20Bit = 500,
	/**
	* Tells your program how to recover from an error.
	*
	* \see MediaObject::errorType()
	*/
	enum ErrorType {
	/**	/**

	* No error. MediaObject::errorType() returns this if	* Audio Data is transported as values from -2^23 to 2^23-1. The da
	* MediaObject::state() != Phonon::ErrorState.	ta is packed in 3
		* Bytes and not padded with a 0 Byte.
	*/	*/

	NoError = 0,	Signed24Bit = 600,
	/**	/**

	* Playback should work, and trying with another URL should work.	* Audio Data is transported as values from -2^31 to 2^31-1
	*/	*/

	NormalError = 1,	Signed32Bit = 700,
	/**	/**

	* Something important does not work. Your program cannot continue	* Audio Data is transported as values from -1.0 to 1.0
	* playback or capture or whatever it was trying to do
	* without help from the user.
	*/	*/

	FatalError = 2	Float32Bit = 800
	};	};


	/**	} // namespace Experimental
	* Returns a (translated) string to show to the user identifying the gi
	ven
	* Category.
	*/
	PHONON_EXPORT QString categoryToString(Category c);

	// TODO: naming
	/*enum MediaStreamType {
	Audio = 1,
	Video = 2,
	StillImage = 4,
	Subtitle = 8,
	AllMedia = 0xFFFFFFFF
	};
	Q_DECLARE_FLAGS(MediaStreamTypes, MediaStreamType)*/
	} // namespace Phonon	} // namespace Phonon

	//Q_DECLARE_OPERATORS_FOR_FLAGS(Phonon::MediaStreamTypes)

	QT_END_NAMESPACE

	//X class kdbgstream;
	//X #include <kdebug.h>
	//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>


	Q_DECLARE_METATYPE(Phonon::State)	#endif // PHONON_X_PHONONNAMESPACE_H
	Q_DECLARE_METATYPE(Phonon::ErrorType)
	Q_DECLARE_METATYPE(Phonon::Category)

	QT_END_HEADER

	// vim: sw=4 ts=4 tw=80
	#endif // PHONONNAMESPACE_H

End of changes. 24 change blocks.
	253 lines changed or deleted	36 lines changed or added

	platformplugin.h	platformplugin.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2007-2008 Matthias Kretz <kretz@kde.org>	Copyright (C) 2007-2008 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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 "phonon_export.h"	#include "phonon_export.h"
	#include "objectdescription.h"	#include "objectdescription.h"

	QT_BEGIN_HEADER	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#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;

	class PlatformPlugin	class PlatformPlugin
	{	{

	skipping to change at line 97	skipping to change at line 103
	*/	*/
	virtual void saveVolume(const QString &outputName, qreal volume) = 0;	virtual void saveVolume(const QString &outputName, qreal volume) = 0;

	/**	/**
	* Loads the volume for the given output.	* Loads the volume for the given output.
	*/	*/
	virtual qreal loadVolume(const QString &outputName) const = 0;	virtual qreal loadVolume(const QString &outputName) const = 0;

	virtual QList<int> objectDescriptionIndexes(ObjectDescriptionType t ype) const = 0;	virtual QList<int> objectDescriptionIndexes(ObjectDescriptionType t ype) const = 0;
	virtual QHash<QByteArray, QVariant> objectDescriptionProperties(Obj ectDescriptionType type, int index) const = 0;	virtual QHash<QByteArray, QVariant> objectDescriptionProperties(Obj ectDescriptionType type, int index) const = 0;

	};


		/**
		* Returns a list of (driver, handle) pairs for the given AudioOutp
		utDevice description.
		*/
		virtual QList<QPair<QByteArray, QString> > deviceAccessListFor(cons
		t Phonon::AudioOutputDevice &) const { return QList<QPair<QByteArray, QStri
		ng> >(); }
		};
	} // namespace Phonon	} // namespace Phonon


	Q_DECLARE_INTERFACE(Phonon::PlatformPlugin, "2PlatformPlugin.phonon.kde.org	Q_DECLARE_INTERFACE(Phonon::PlatformPlugin, "3PlatformPlugin.phonon.kde.org
	")	")

		#endif //QT_NO_PHONON_PLATFORMPLUGIN

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	#endif // PHONON_PLATFORMPLUGIN_H	#endif // PHONON_PLATFORMPLUGIN_H

End of changes. 8 change blocks.
	11 lines changed or deleted	26 lines changed or added

	seekslider.h	seekslider.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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 <QtGui/QWidget>

	QT_BEGIN_HEADER	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_SEEKSLIDER

	namespace Phonon	namespace Phonon
	{	{
	class MediaObject;	class MediaObject;

	class SeekSliderPrivate;	class SeekSliderPrivate;

	/** \class SeekSlider seekslider.h Phonon/SeekSlider	/** \class SeekSlider seekslider.h Phonon/SeekSlider
	* \short Widget providing a slider for seeking in MediaObject objects.	* \short Widget providing a slider for seeking in MediaObject objects.
	*	*
	* \ingroup PhononWidgets	* \ingroup PhononWidgets

	skipping to change at line 146	skipping to change at line 151
	Q_PRIVATE_SLOT(k_func(), void _k_stateChanged(Phonon::State))	Q_PRIVATE_SLOT(k_func(), void _k_stateChanged(Phonon::State))
	Q_PRIVATE_SLOT(k_func(), void _k_seek(int))	Q_PRIVATE_SLOT(k_func(), void _k_seek(int))
	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

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	// vim: sw=4 ts=4 tw=80	// vim: sw=4 ts=4 tw=80
	#endif // PHONON_UI_SEEKSLIDER_H	#endif // PHONON_UI_SEEKSLIDER_H

End of changes. 5 change blocks.
	8 lines changed or deleted	15 lines changed or added

	streaminterface.h	streaminterface.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_ABSTRACTMEDIASTREAM

	namespace Phonon	namespace Phonon
	{	{
	class StreamInterfacePrivate;	class StreamInterfacePrivate;
	class MediaSource;	class MediaSource;

	/** \class StreamInterface streaminterface.h Phonon/StreamInterface	/** \class StreamInterface streaminterface.h Phonon/StreamInterface
	* \brief Backend interface to handle media streams (AbstractMediaStream).	* \brief Backend interface to handle media streams (AbstractMediaStream).
	*	*
	* \author Matthias Kretz <kretz@kde.org>	* \author Matthias Kretz <kretz@kde.org>
	*/	*/

	skipping to change at line 113	skipping to change at line 118

	protected:	protected:
	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

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	#endif // PHONON_STREAMINTERFACE_H	#endif // PHONON_STREAMINTERFACE_H

End of changes. 5 change blocks.
	8 lines changed or deleted	15 lines changed or added

	videodataoutput.h	videodataoutput.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2005-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2005-2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#ifndef PHONON_VIDEODATAOUTPUT_H	#ifndef PHONON_VIDEODATAOUTPUT_H
	#define PHONON_VIDEODATAOUTPUT_H	#define PHONON_VIDEODATAOUTPUT_H

	#include "export.h"	#include "export.h"
	#include "../abstractvideooutput.h"	#include "../abstractvideooutput.h"
	#include "../phonondefs.h"	#include "../phonondefs.h"
	#include <QtCore/QObject>	#include <QtCore/QObject>

	skipping to change at line 42	skipping to change at line 45
	class QSize;	class QSize;

	namespace Phonon	namespace Phonon
	{	{
	namespace Experimental	namespace Experimental
	{	{
	class VideoDataOutputPrivate;	class VideoDataOutputPrivate;
	struct VideoFrame;	struct VideoFrame;

	/**	/**

	* \short This class gives you the video data.	* \short This class gives you nothing. ;-)
	*	* \deprecated
	* This class implements a special AbstractVideoOutput that gives your
	* application the video data.
	*
	* You can also use the video data for further processing (e.g. encodin
	g and
	* saving to a file).
	*	*
	* \author Matthias Kretz <kretz@kde.org>	* \author Matthias Kretz <kretz@kde.org>
	*/	*/
	class PHONONEXPERIMENTAL_EXPORT VideoDataOutput : public QObject, publi c AbstractVideoOutput	class PHONONEXPERIMENTAL_EXPORT VideoDataOutput : public QObject, publi c AbstractVideoOutput
	{	{
	Q_OBJECT	Q_OBJECT
	K_DECLARE_PRIVATE(VideoDataOutput)	K_DECLARE_PRIVATE(VideoDataOutput)
	/**	/**
	* This property retrieves the nominal latency of the	* This property retrieves the nominal latency of the
	* backend.	* backend.

End of changes. 4 change blocks.
	16 lines changed or deleted	13 lines changed or added

	videoframe.h	videoframe.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#ifndef PHONON_EXPERIMENTAL_VIDEOFRAME_H	#ifndef PHONON_EXPERIMENTAL_VIDEOFRAME_H
	#define PHONON_EXPERIMENTAL_VIDEOFRAME_H	#define PHONON_EXPERIMENTAL_VIDEOFRAME_H

	#include "export.h"	#include "export.h"
	#include "videodataoutput.h"	#include "videodataoutput.h"
	#include <QtCore/QByteRef>	#include <QtCore/QByteRef>


End of changes. 3 change blocks.
	8 lines changed or deleted	11 lines changed or added

	videoplayer.h	videoplayer.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2004-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2004-2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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 <QtGui/QWidget>

	QT_BEGIN_HEADER	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_VIDEOPLAYER

	namespace Phonon	namespace Phonon
	{	{
	class VideoPlayerPrivate;	class VideoPlayerPrivate;
	class MediaObject;	class MediaObject;
	class AudioOutput;	class AudioOutput;
	class VideoWidget;	class VideoWidget;

	/** \class VideoPlayer videoplayer.h Phonon/VideoPlayer	/** \class VideoPlayer videoplayer.h Phonon/VideoPlayer
	* \short Playback class for simple tasks.	* \short Playback class for simple tasks.
	*	*
	* With %VideoPlayer you can get results quickly and easily. You can do the standard	* With %VideoPlayer you can get results quickly and easily. You can do the standard
	* playback tasks like play, pause and stop, but also set a playback volume and	* playback tasks like play, pause and stop, but also set a playback volume and
	* seek (there's no guarantee that the seek will work, though).	* seek (there's no guarantee that the seek will work, though).
	*	*
	* Keep in mind that when the %VideoPlayer instance is deleted the playback will	* Keep in mind that when the %VideoPlayer instance is deleted the playback will
	* stop.	* stop.
	*	*
	* A play and forget code example:	* A play and forget code example:
	* \code	* \code

	* VideoPlayer *player = new VideoPlayer(Phonon::VideoCategory, parentWidge t);	* VideoPlayer *player = new VideoPlayer(parentWidget);
	* connect(player, SIGNAL(finished()), player, SLOT(deleteLater()));	* connect(player, SIGNAL(finished()), player, SLOT(deleteLater()));
	* player->play(url);	* player->play(url);
	* \endcode	* \endcode
	*	*
	* \ingroup Playback	* \ingroup Playback
	* \ingroup PhononVideo	* \ingroup PhononVideo
	* \author Matthias Kretz <kretz@kde.org>	* \author Matthias Kretz <kretz@kde.org>
	*/	*/
	class PHONON_EXPORT VideoPlayer : public QWidget	class PHONON_EXPORT VideoPlayer : public QWidget
	{	{

	skipping to change at line 72	skipping to change at line 77
	public:	public:
	/**	/**
	* Constructs a new %VideoPlayer instance.	* Constructs a new %VideoPlayer instance.
	*	*
	* \param category The category used for the audio output device.	* \param category The category used for the audio output device.
	* \param parent The QObject parent.	* \param parent The QObject parent.
	*/	*/
	explicit VideoPlayer(Phonon::Category category, QWidget *parent = 0 );	explicit VideoPlayer(Phonon::Category category, QWidget *parent = 0 );

	/**	/**

		* Constructs a new video widget with a \p parent
		* using Phonon::VideoCategory as its category.
		*
		* \param parent The QObject parent.
		*/
		VideoPlayer(QWidget *parent = 0);

		/**
	* On destruction the playback is stopped, also the audio output is	* On destruction the playback is stopped, also the audio output is
	* removed so that the desktop mixer will not show the application	* removed so that the desktop mixer will not show the application
	* anymore. If you need a persistent audio output don't use	* anymore. If you need a persistent audio output don't use
	* %VideoPlayer but MediaObject, VideoPath and VideoOutput.	* %VideoPlayer but MediaObject, VideoPath and VideoOutput.
	*/	*/
	~VideoPlayer();	~VideoPlayer();

	/**	/**
	* Get the total time (in milliseconds) of the file currently being played.	* Get the total time (in milliseconds) of the file currently being played.
	*/	*/

	skipping to change at line 188	skipping to change at line 201
	* This signal is emitted when the playback finished.	* This signal is emitted when the playback finished.
	*/	*/
	void finished();	void finished();

	protected:	protected:
	VideoPlayerPrivate *const d;	VideoPlayerPrivate *const d;
	};	};

	} //namespace Phonon	} //namespace Phonon


		#endif //QT_NO_PHONON_VIDEOPLAYER

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	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. 7 change blocks.
	9 lines changed or deleted	24 lines changed or added

	videowidget.h	videowidget.h
	/* This file is part of the KDE project	/* This file is part of the KDE project

	Copyright (C) 2005-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2008 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#ifndef Phonon_VIDEOWIDGET_H
	#define Phonon_VIDEOWIDGET_H

	#include "phonon_export.h"
	#include "phonondefs.h"
	#include "abstractvideooutput.h"
	#include <QtGui/QWidget>

	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE


	class QString;	#ifndef PHONON_EXPERIMENTAL_VIDEOWIDGET_H
		#define PHONON_EXPERIMENTAL_VIDEOWIDGET_H


		#include "../videowidget.h"
	namespace Phonon	namespace Phonon
	{	{

	class AbstractVideoOutput;	namespace Experimental
	class VideoWidgetPrivate;	{
	/** \class VideoWidget videowidget.h Phonon/VideoWidget
	* \short Widget to display video.
	*
	* This widget shows the video signal.
	*
	* \code
	* MediaObject *media = new MediaObject(parent);
	* VideoWidget *vwidget = new VideoWidget(parent);
	* Phonon::createPath(media, vwidget);
	* \endcode
	*
	* \ingroup PhononVideo
	* \ingroup PhononWidgets
	* \author Matthias Kretz <kretz@kde.org>
	*/
	class PHONON_EXPORT VideoWidget : public QWidget, public Phonon::Abstra
	ctVideoOutput
	{
	K_DECLARE_PRIVATE(VideoWidget)
	Q_OBJECT
	Q_ENUMS(AspectRatio ScaleMode)
	/**
	* This property holds whether the video is shown using the complet
	e
	* screen.
	*
	* The property differs from QWidget::fullScreen in that it is
	* writeable.
	*
	* By default the widget is not shown in fullScreen.
	*
	* \warning When switching the video to fullscreen using setFullScr
	een
	* your application loses control over the widget that actually sho
	ws
	* the video (which is then shown as a toplevel window while your
	* application still uses this widget). If you only need to capture
	key
	* events the event forwarding done internally should suffice for y
	our
	* needs. If you need to map mouse coordinates or add widgets (that
	are
	* not overlays) you should probably handle fullscreen yourself.
	*/
	Q_PROPERTY(bool fullScreen READ isFullScreen WRITE setFullScreen)
	/**
	*
	* Defaults to AspectRatioAuto.
	*
	* \see AspectRatio
	*/
	Q_PROPERTY(AspectRatio aspectRatio READ aspectRatio WRITE setAspect
	Ratio)

	/**
	* If the size of the widget and the size of the video are not equa
	l.
	* The video will be zoomed to fit the widget. The smaller zoom
	* (AddBarsScaleMode) adds black bars at the left/right or top/bott
	om to
	* make all of the image visible (default). The bigger zoom (Expand
	Mode)
	* fills the widget completely, keeping all information in one dire
	ction
	* and leaving parts of the image outside of the widget in the othe
	r
	* direction.
	*/
	Q_PROPERTY(ScaleMode scaleMode READ scaleMode WRITE setScaleMode)

	/**
	* This property holds brightness of the video.
	*
	* Default is 0. Acceptable values are in range of -1, 1.
	*/
	Q_PROPERTY(qreal brightness READ brightness WRITE setBrightness)
	/**
	* This property holds the contrast of the video.
	*
	* Default is 0. Acceptable values are in range of -1, 1.
	*/
	Q_PROPERTY(qreal contrast READ contrast WRITE setContrast)
	/**
	* This property holds the hue of the video.
	*
	* Default is 0. Acceptable values are in range of -1, 1.
	*/
	Q_PROPERTY(qreal hue READ hue WRITE setHue)
	/**
	* This property holds saturation of the video.
	*
	* Default is 0. Acceptable values are in range of -1, 1.
	*/
	Q_PROPERTY(qreal saturation READ saturation WRITE setSaturation)

	public:
	/**
	* Defines the width:height to be used for the video.
	*/
	enum AspectRatio
	{
	/**
	* Let the decoder find the aspect ratio automatically from
	the
	* media file (this is the default).
	*/
	AspectRatioAuto = 0,
	/**
	* Fits the video into the widget making the aspect ratio d
	epend
	* solely on the size of the widget. This way the aspect ra
	tio
	* is freely resizeable by the user.
	*/
	AspectRatioWidget = 1,
	/**
	* Make width/height == 4/3, which is the old TV size and
	* monitor size (1024/768 == 4/3). (4:3)
	*/
	AspectRatio4_3 = 2,
	/**
	* Make width/height == 16/9, which is the size of most cur
	rent
	* media. (16:9)
	*/
	AspectRatio16_9 = 3
	//X /**
	//X * Assume that every pixel of the video image needs to
	be displayed with the same
	//X * physical width and height. (1:1 image pixels, not im
	agewidth
	//X * = imageheight)
	//X */
	//X AspectRatioSquare = 4,
	};

	enum ScaleMode {
	FitInView = 0,
	ScaleAndCrop = 1
	};

	/**
	* Constructs a new video widget with a \p parent.
	*/
	VideoWidget(QWidget *parent = 0);

	AspectRatio aspectRatio() const;
	ScaleMode scaleMode() const;

	qreal brightness() const;
	qreal contrast() const;
	qreal hue() const;
	qreal saturation() const;

	//TODO: bar colors property
	public Q_SLOTS:
	void setFullScreen(bool fullscreen);

	/**
	* Convenience slot, calling setFullScreen(false)
	*/
	void exitFullScreen();

	/**
	* Convenience slot, calling setFullScreen(true)
	*/
	void enterFullScreen();

	void setAspectRatio(AspectRatio);
	void setScaleMode(ScaleMode);

	void setBrightness(qreal value);
	void setContrast(qreal value);
	void setHue(qreal value);
	void setSaturation(qreal value);

	protected:
	/**
	* \internal
	*
	* Constructs a new video widget with private data pointer \p d
	and
	* a \p parent.
	*/
	VideoWidget(VideoWidgetPrivate &d, QWidget *parent);


	void mouseMoveEvent(QMouseEvent *);	class VideoWidgetPrivate;
	bool event(QEvent *);	class VideoWidget : public Phonon::VideoWidget
	};	{
		K_DECLARE_PRIVATE(VideoWidget)
		Q_OBJECT
		public:
		VideoWidget(QWidget *parent = 0);


	} //namespace Phonon	QImage snapshot() const;
		};


	QT_END_NAMESPACE	} // namespace Experimental
	QT_END_HEADER	} // namespace Phonon


	// vim: sw=4 ts=4 tw=80	#endif // PHONON_EXPERIMENTAL_VIDEOWIDGET_H
	#endif // Phonon_VIDEOWIDGET_H

End of changes. 12 change blocks.
	213 lines changed or deleted	28 lines changed or added

	videowidgetinterface.h	videowidgetinterface.h
	/* This file is part of the KDE project	/* This file is part of the KDE project

	Copyright (C) 2007 Trolltech ASA. <thierry.bastian@trolltech.com>	Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). <thie rry.bastian@trolltech.com>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#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;
	virtual void setAspectRatio(Phonon::VideoWidget::AspectRatio) = 0;	virtual void setAspectRatio(Phonon::VideoWidget::AspectRatio) = 0;
	virtual qreal brightness() const = 0;	virtual qreal brightness() const = 0;

	skipping to change at line 55	skipping to change at line 60
	virtual qreal saturation() const = 0;	virtual qreal saturation() const = 0;
	virtual void setSaturation(qreal) = 0;	virtual void setSaturation(qreal) = 0;
	virtual QWidget *widget() = 0;	virtual QWidget *widget() = 0;
	//X virtual int overlayCapabilities() const = 0;	//X virtual int overlayCapabilities() const = 0;
	//X virtual bool createOverlay(QWidget *widget, int type) = 0;	//X virtual bool createOverlay(QWidget *widget, int type) = 0;
	};	};
	}	}

	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

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	#endif // PHONON_VIDEOWIDGETINTERFACE_H	#endif // PHONON_VIDEOWIDGETINTERFACE_H

End of changes. 6 change blocks.
	9 lines changed or deleted	16 lines changed or added

	visualization.h	visualization.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#ifndef PHONON_VISUALIZATION_H	#ifndef PHONON_VISUALIZATION_H
	#define PHONON_VISUALIZATION_H	#define PHONON_VISUALIZATION_H

	#include "export.h"	#include "export.h"
	#include "../phonondefs.h"	#include "../phonondefs.h"
	#include <QtCore/QObject>	#include <QtCore/QObject>
	#include "../objectdescription.h"	#include "../objectdescription.h"

End of changes. 3 change blocks.
	8 lines changed or deleted	11 lines changed or added

	volumefadereffect.h	volumefadereffect.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_VOLUMEFADEREFFECT

	namespace Phonon	namespace Phonon
	{	{
	class VolumeFaderEffectPrivate;	class VolumeFaderEffectPrivate;

	/** \class VolumeFaderEffect volumefadereffect.h Phonon/VolumeFaderEffe ct	/** \class VolumeFaderEffect volumefadereffect.h Phonon/VolumeFaderEffe ct
	* Audio effect to gradually fade the audio volume.	* Audio effect to gradually fade the audio volume.
	*	*
	* This effect differs from gradually changing the output volume in tha t	* This effect differs from gradually changing the output volume in tha t
	* a dedicated effect can change the volume in the smallest possible	* a dedicated effect can change the volume in the smallest possible
	* steps while every other volume control will make more or less	* steps while every other volume control will make more or less

	skipping to change at line 167	skipping to change at line 172
	* Tells the Fader to change the volume from the current value to	* Tells the Fader to change the volume from the current value to
	* \p volume in \p fadeTime milliseconds	* \p volume in \p fadeTime milliseconds
	*	*
	* \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

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	// vim: sw=4 ts=4 tw=80	// vim: sw=4 ts=4 tw=80
	#endif // PHONON_VOLUMEFADEREFFECT_H	#endif // PHONON_VOLUMEFADEREFFECT_H

End of changes. 5 change blocks.
	8 lines changed or deleted	15 lines changed or added

	volumefaderinterface.h	volumefaderinterface.h
	/* This file is part of the KDE project	/* This file is part of the KDE project

	Copyright (C) 2007 Trolltech ASA. <thierry.bastian@trolltech.com>	Copyright (C) 2008 Nokia Corporation and/or its subsidiary(-ies). <thie rry.bastian@trolltech.com>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#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; }
	virtual void setVolume(float) {}	virtual void setVolume(float) {}
	virtual Phonon::VolumeFaderEffect::FadeCurve fadeCurve() const {	virtual Phonon::VolumeFaderEffect::FadeCurve fadeCurve() const {
	return VolumeFaderEffect::Fade3Decibel;	return VolumeFaderEffect::Fade3Decibel;
	}	}
	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

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	QT_END_HEADER

	#endif // PHONON_VOLUMEFADERINTERFACE_H	#endif // PHONON_VOLUMEFADERINTERFACE_H

End of changes. 6 change blocks.
	9 lines changed or deleted	16 lines changed or added

	volumeslider.h	volumeslider.h
	/* This file is part of the KDE project	/* This file is part of the KDE project
	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>	Copyright (C) 2006-2007 Matthias Kretz <kretz@kde.org>

	This library is free software; you can redistribute it and/or	This library is free software; you can redistribute it and/or

	modify it under the terms of the GNU Library General Public	modify it under the terms of the GNU Lesser General Public
	License version 2 as published by the Free Software Foundation.	License as published by the Free Software Foundation; either
		version 2.1 of the License, or (at your option) version 3, or any
		later version accepted by the membership of KDE e.V. (or its
		successor approved by the membership of KDE e.V.), Trolltech ASA
		(or its successors, if any) and the KDE Free Qt Foundation, which shall
		act as a proxy defined in Section 6 of version 3 of the license.

	This library is distributed in the hope that it will be useful,	This library is distributed in the hope that it will be useful,
	but WITHOUT ANY WARRANTY; without even the implied warranty of	but WITHOUT ANY WARRANTY; without even the implied warranty of
	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU	MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU

	Library General Public License for more details.	Lesser General Public License for more details.


	You should have received a copy of the GNU Library General Public Licen	You should have received a copy of the GNU Lesser General Public
	se	License along with this library. If not, see <http://www.gnu.org/licen
	along with this library; see the file COPYING.LIB. If not, write to	ses/>.
	the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
	Boston, MA 02110-1301, USA.

	*/	*/

	#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 <QtGui/QWidget>

	QT_BEGIN_HEADER	QT_BEGIN_HEADER
	QT_BEGIN_NAMESPACE	QT_BEGIN_NAMESPACE


		#ifndef QT_NO_PHONON_VOLUMESLIDER

	namespace Phonon	namespace Phonon
	{	{
	class AudioOutput;	class AudioOutput;
	class VolumeSliderPrivate;	class VolumeSliderPrivate;

	/** \class VolumeSlider volumeslider.h Phonon/VolumeSlider	/** \class VolumeSlider volumeslider.h Phonon/VolumeSlider
	* \short Widget providing a slider to control the volume of an AudioOutput .	* \short Widget providing a slider to control the volume of an AudioOutput .
	*	*
	* \ingroup PhononWidgets	* \ingroup PhononWidgets
	* \author Matthias Kretz <kretz@kde.org>	* \author Matthias Kretz <kretz@kde.org>

	skipping to change at line 144	skipping to change at line 149

	private:	private:
	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

	QT_END_NAMESPACE	QT_END_NAMESPACE
	QT_END_HEADER	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. 5 change blocks.
	8 lines changed or deleted	15 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/