abstractaudiodataoutput.h   abstractaudiodataoutput.h 
/* This file is part of the KDE project /* This file is part of the KDE project
Copyright (C) 2005-2006,2008 Matthias Kretz <kretz@kde.org> Copyright (C) 2005-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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 abstractvideodataoutput.h   abstractvideodataoutput.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) 2005-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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
skipping to change at line 63 skipping to change at line 63
class PHONON_EXPORT AbstractVideoOutput : public MediaNode class PHONON_EXPORT AbstractVideoOutput : public MediaNode
{ {
friend class Experimental::Visualization; friend class Experimental::Visualization;
friend class Experimental::VisualizationPrivate; friend class Experimental::VisualizationPrivate;
K_DECLARE_PRIVATE(AbstractVideoOutput) K_DECLARE_PRIVATE(AbstractVideoOutput)
protected: protected:
/** /**
* \internal * \internal
* Constructor that is called from derived classes. * Constructor that is called from derived classes.
* *
* \param parent Standard QObject parent. * \param d the private object
*/ */
AbstractVideoOutput(AbstractVideoOutputPrivate &d); AbstractVideoOutput(AbstractVideoOutputPrivate &d);
}; };
} //namespace Phonon } //namespace Phonon
#endif //QT_NO_PHONON_VIDEO #endif //QT_NO_PHONON_VIDEO
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
*/ */
#ifndef Phonon_AUDIODATAOUTPUT_H #ifndef Phonon_AUDIODATAOUTPUT_H
#define Phonon_AUDIODATAOUTPUT_H #define Phonon_AUDIODATAOUTPUT_H
#include "export.h" #include "phonon_export.h"
#include "../abstractaudiooutput.h" #include "abstractaudiooutput.h"
#include "../phonondefs.h" #include "phonondefs.h"
#ifndef DOXYGEN_SHOULD_SKIP_THIS #ifndef DOXYGEN_SHOULD_SKIP_THIS
template<typename T> class QVector; template<typename T> class QVector;
template<typename Key, typename T> class QMap; template<typename Key, typename T> class QMap;
#endif #endif
namespace Phonon namespace Phonon
{ {
namespace Experimental
{
class AudioDataOutputPrivate; class AudioDataOutputPrivate;
/** /**
* \short This class gives you the audio data (for visualizations). * \short This class gives you the audio data (for visualizations).
* *
* This class implements a special AbstractAudioOutput that gives your * This class implements a special AbstractAudioOutput that gives your
* application the audio data. Don't expect realtime performance. But * application the audio data. Don't expect realtime performance. But
* the latencies should be low enough to use the audio data for * the latencies should be low enough to use the audio data for
* visualizations. You can also use the audio data for further processi ng * visualizations. You can also use the audio data for further processi ng
* (e.g. encoding and saving to a file). * (e.g. encoding and saving to a file).
* *
* The class supports different data formats. One of the most common fo
rmats
* is to read vectors of integers (which will only use 16 Bit), but you
can
* also request floats which some backends use internally.
*
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class PHONONEXPERIMENTAL_EXPORT AudioDataOutput : public AbstractAudioO utput class PHONON_EXPORT AudioDataOutput : public AbstractAudioOutput
{ {
Q_OBJECT Q_OBJECT
K_DECLARE_PRIVATE(AudioDataOutput) K_DECLARE_PRIVATE(AudioDataOutput)
Q_ENUMS(Channel Format) Q_ENUMS(Channel)
Q_PROPERTY(Format format READ format WRITE setFormat)
Q_PROPERTY(int dataSize READ dataSize WRITE setDataSize) Q_PROPERTY(int dataSize READ dataSize WRITE setDataSize)
PHONON_HEIR(AudioDataOutput) PHONON_HEIR(AudioDataOutput)
public: public:
/** /**
* Specifies the channel the audio data belongs to. * Specifies the channel the audio data belongs to.
*/ */
enum Channel enum Channel
{ {
LeftChannel, LeftChannel,
RightChannel, RightChannel,
CenterChannel, CenterChannel,
LeftSurroundChannel, LeftSurroundChannel,
RightSurroundChannel, RightSurroundChannel,
SubwooferChannel SubwooferChannel
}; };
/** /**
* Used for telling the object whether you want 16 bit Integers
or
* 32 bit floats.
*
* \see requestFormat
*/
enum Format
{
/**
* Requests 16 bit signed integers.
*
* \see dataReady(const QVector<qint16> &)
*/
IntegerFormat = 1,
/**
* Requests 32 bit floating point: signed, zero centered, a
nd
* normalized to the unit value (-1.0 to 1.0).
*
* \see dataReady(const QVector<float> &)
*/
FloatFormat = 2
};
/**
* Returns the currently used format.
*
* \see setFormat
*/
Format format() const;
/**
* Returns the currently used number of samples passed through * Returns the currently used number of samples passed through
* the signal. * the signal.
* *
* \see setDataSize * \see setDataSize
*/ */
int dataSize() const; int dataSize() const;
/** /**
* Returns the sample rate in Hz. Common sample rates are 44100 Hz * Returns the sample rate in Hz. Common sample rates are 44100 Hz
* and 48000 Hz. AudioDataOutput will not do any sample rate * and 48000 Hz. AudioDataOutput will not do any sample rate
skipping to change at line 130 skipping to change at line 93
* is often enough to do simple interpolation or even drop/dupl icate * is often enough to do simple interpolation or even drop/dupl icate
* samples. * samples.
* *
* \return The sample rate as reported by the backend. If the * \return The sample rate as reported by the backend. If the
* backend is unavailable -1 is returned. * backend is unavailable -1 is returned.
*/ */
int sampleRate() const; int sampleRate() const;
public Q_SLOTS: public Q_SLOTS:
/** /**
* Requests the dataformat you'd like to receive. Only one of t
he
* signals of this class will be emitted when new data is ready
.
*
* The default format is IntegerFormat.
*
* \see format()
*/
void setFormat(Format format);
/**
* Sets the number of samples to be passed in one signal emissi on. * Sets the number of samples to be passed in one signal emissi on.
* *
* Defaults to 512 samples per emitted signal. * Defaults to 512 samples per emitted signal.
* *
* \param size the number of samples * \param size the number of samples
*/ */
void setDataSize(int size); void setDataSize(int size);
Q_SIGNALS: Q_SIGNALS:
/** /**
* Emitted whenever another dataSize number of samples are read * Emitted whenever another dataSize number of samples are read
y and y.
* format is set to IntegerFormat.
*
* If format is set to FloatFormat the signal is not emitted at
all.
*
* \param data A mapping of Channel to a vector holding the aud
io data.
*/
void dataReady(const QMap<Phonon::Experimental::AudioDataOutput
::Channel, QVector<qint16> > &data);
/**
* Emitted whenever another dataSize number of samples are read
y and
* format is set to FloatFormat.
*
* If format is set to IntegerFormat the signal is not emitted
at all.
* *
* \param data A mapping of Channel to a vector holding the aud io data. * \param data A mapping of Channel to a vector holding the aud io data.
*/ */
void dataReady(const QMap<Phonon::Experimental::AudioDataOutput ::Channel, QVector<float> > &data); void dataReady(const QMap<Phonon::AudioDataOutput::Channel, QVe ctor<qint16> > &data);
/** /**
* This signal is emitted before the last dataReady signal of a * This signal is emitted before the last dataReady signal of a
* media is emitted. * media is emitted.
* *
* If, for example, the playback of a media file has finished a nd the * If, for example, the playback of a media file has finished a nd the
* last audio data of that file is going to be passed with the next * last audio data of that file is going to be passed with the next
* dataReady signal, and only the 28 first samples of the data * dataReady signal, and only the 28 first samples of the data
* vector are from that media file endOfMedia will be emitted r ight * vector are from that media file endOfMedia will be emitted r ight
* before dataReady with \p remainingSamples = 28. * before dataReady with \p remainingSamples = 28.
* *
* \param remainingSamples The number of samples in the next * \param remainingSamples The number of samples in the next
* dataReady vector that belong to the media that was playing t o * dataReady vector that belong to the media that was playing t o
* this point. * this point.
*/ */
void endOfMedia(int remainingSamples); void endOfMedia(int remainingSamples);
}; };
} // namespace Experimental
} // namespace Phonon } // namespace Phonon
// vim: sw=4 ts=4 tw=80 // vim: sw=4 ts=4 tw=80
#endif // Phonon_AUDIODATAOUTPUT_H #endif // Phonon_AUDIODATAOUTPUT_H
 End of changes. 11 change blocks. 
81 lines changed or deleted 9 lines changed or added


 audiodataoutputinterface.h   audiodataoutputinterface.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 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
*/ */
#ifndef PHONON_X_AUDIODATAOUTPUTINTERFACE_H #ifndef PHONON_AUDIODATAOUTPUTINTERFACE_H
#define PHONON_X_AUDIODATAOUTPUTINTERFACE_H #define PHONON_AUDIODATAOUTPUTINTERFACE_H
namespace Phonon namespace Phonon
{ {
namespace Experimental
{
class AbstractAudioDataOutput; class AudioDataOutput;
class AudioDataOutputInterface class AudioDataOutputInterface
{ {
public: public:
virtual ~AudioDataOutputInterface() {} virtual ~AudioDataOutputInterface() {}
virtual AbstractAudioDataOutput *frontendObject() const = 0; virtual AudioDataOutput *frontendObject() const = 0;
virtual void setFrontendObject(AbstractAudioDataOutput *) = 0; virtual void setFrontendObject(AudioDataOutput *) = 0;
}; };
} // namespace Experimental
} // namespace Phonon } // namespace Phonon
Q_DECLARE_INTERFACE(Phonon::Experimental::AudioDataOutputInterface, "0Audio DataOutputInterface.phonon.kde.org") Q_DECLARE_INTERFACE(Phonon::AudioDataOutputInterface, "0AudioDataOutputInte rface.phonon.kde.org")
#endif // PHONON_X_AUDIODATAOUTPUTINTERFACE_H #endif // PHONON_AUDIODATAOUTPUTINTERFACE_H
 End of changes. 8 change blocks. 
10 lines changed or deleted 7 lines changed or added


 audioformat.h   audioformat.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 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
skipping to change at line 67 skipping to change at line 67
* 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 * Every time the volume in the backend changes it should emit volu meChanged(qreal), also
* inside this function. * 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;
/** /**
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 lines changed or added


 avcapture.h   avcapture.h 
/* This file is part of the KDE project /* This file is part of the KDE project
Copyright (C) 2005-2006, 2008 Matthias Kretz <kretz@kde.org> Copyright (C) 2005-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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
skipping to change at line 34 skipping to change at line 34
#define Phonon_BACKENDCAPABILITIES_H #define Phonon_BACKENDCAPABILITIES_H
#include "phonon_export.h" #include "phonon_export.h"
#include "objectdescription.h" #include "objectdescription.h"
#include <QtCore/QObject> #include <QtCore/QObject>
QT_BEGIN_HEADER QT_BEGIN_HEADER
QT_BEGIN_NAMESPACE QT_BEGIN_NAMESPACE
#ifdef __QT_SYNCQT__
// Tell syncqt that the BackendCapabilities namespace should be treated lik
e a class
#pragma qt_class(Phonon::BackendCapabilities)
#pragma qt_sync_stop_processing
#endif
template<class T> class QList; template<class T> class QList;
class QStringList; class QStringList;
namespace Phonon namespace Phonon
{ {
/** /**
* Collection of functions describing the capabilities of the Backend. * Collection of functions describing the capabilities of the Backend.
* *
* \ingroup BackendInformation * \ingroup BackendInformation
 End of changes. 2 change blocks. 
1 lines changed or deleted 8 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
skipping to change at line 81 skipping to change at line 81
//X enum Type { //X enum Type {
//X AudioEffect, //X AudioEffect,
//X VideoEffect //X VideoEffect
//X }; //X };
/** /**
* QObject constructor. * QObject constructor.
* *
* \param description An EffectDescription object to determine the * \param description An EffectDescription object to determine the
* type of effect. See \ref * type of effect. See BackendCapabilities::availableAudioEffec
* BackendCapabilities::availableAudioEffects(). ts().
* \param parent QObject parent * \param parent QObject parent
*/ */
explicit Effect(const EffectDescription &description, QObject * parent = 0); explicit Effect(const EffectDescription &description, QObject * parent = 0);
//X Type type() const; //X Type type() const;
/** /**
* Returns the description of this effect. This is the same typ e as was * Returns the description of this effect. This is the same typ e as was
* passed to the constructor. * passed to the constructor.
*/ */
 End of changes. 2 change blocks. 
3 lines changed or deleted 3 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
skipping to change at line 42 skipping to change at line 42
#ifndef QT_NO_PHONON_EFFECTWIDGET #ifndef QT_NO_PHONON_EFFECTWIDGET
namespace Phonon namespace Phonon
{ {
class Effect; class Effect;
class EffectWidgetPrivate; class EffectWidgetPrivate;
/** \class EffectWidget effectwidget.h Phonon/EffectWidget /** \class EffectWidget effectwidget.h Phonon/EffectWidget
* \brief Widget to control the parameters of an \ref Effect. * \brief Widget to control the parameters of an Effect.
* *
* \ingroup PhononWidgets * \ingroup PhononWidgets
* \ingroup PhononEffects * \ingroup PhononEffects
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class PHONON_EXPORT EffectWidget : public QWidget class PHONON_EXPORT EffectWidget : public QWidget
{ {
Q_OBJECT Q_OBJECT
K_DECLARE_PRIVATE(EffectWidget) K_DECLARE_PRIVATE(EffectWidget)
public: public:
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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) 2008 Nokia Corporation and/or its subsidiary(-ies). <thie rry.bastian@trolltech.com> Copyright (C) 2009 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
skipping to change at line 50 skipping to change at line 50
* *
* This class is the most important class in %Phonon. Use it to open a media * This class is the most important class in %Phonon. Use it to open a media
* file at an arbitrary location, a CD or DVD or to stream media data f rom * file at an arbitrary location, a CD or DVD or to stream media data f rom
* the application to the backend. * the application to the backend.
* *
* This class controls the state (play, pause, stop, seek) * This class controls the state (play, pause, stop, seek)
* and you can use it to get a lot of information about the media data. * and you can use it to get a lot of information about the media data.
* *
* Notice that most functions of this class are asynchronous. * Notice that most functions of this class are asynchronous.
* That means if you call play() the object only starts playing when th e * That means if you call play() the object only starts playing when th e
* stateChanged() signal tells you that the object changed into \ref Pl ayingState. * stateChanged() signal tells you that the object changed into Playing State.
* The states you can expect are documented for those methods. * The states you can expect are documented for those methods.
* *
* A common usage example is the following: * A common usage example is the following:
* \code * \code
* media = new MediaObject(this); * media = new MediaObject(this);
* connect(media, SIGNAL(finished()), SLOT(slotFinished()); * connect(media, SIGNAL(finished()), SLOT(slotFinished());
* media->setCurrentSource("/home/username/music/filename.ogg"); * media->setCurrentSource("/home/username/music/filename.ogg");
* media->play(); * media->play();
* \endcode * \endcode
* *
* If you want to play more that one media file (one after another) you can * If you want to play more than one media file (one after another) you can
* either tell MediaObject about all those files * either tell MediaObject about all those files
* \code * \code
* media->setCurrentSource(":/sounds/startsound.ogg"); * media->setCurrentSource(":/sounds/startsound.ogg");
* media->enqueue("/home/username/music/song.mp3"); * media->enqueue("/home/username/music/song.mp3");
* media->enqueue(":/sounds/endsound.ogg"); * media->enqueue(":/sounds/endsound.ogg");
* \endcode * \endcode
* or provide the next file just in time: * or provide the next file just in time:
* \code * \code
* media->setCurrentSource(":/sounds/startsound.ogg"); * media->setCurrentSource(":/sounds/startsound.ogg");
* connect(media, SIGNAL(aboutToFinish()), SLOT(enqueueNextSource())) ; * connect(media, SIGNAL(aboutToFinish()), SLOT(enqueueNextSource())) ;
skipping to change at line 121 skipping to change at line 121
* This property specifies the time in milliseconds the * This property specifies the time in milliseconds the
* prefinishMarkReached signal is * prefinishMarkReached signal is
* emitted before the playback finishes. A value of \c 0 disables t he * emitted before the playback finishes. A value of \c 0 disables t he
* signal. * signal.
* *
* Defaults to \c 0 (disabled). * Defaults to \c 0 (disabled).
* *
* \warning For some media data the total time cannot be determined * \warning For some media data the total time cannot be determined
* accurately, therefore the accuracy of the prefinishMarkReached s ignal * accurately, therefore the accuracy of the prefinishMarkReached s ignal
* can be bad sometimes. Still, it is better to use this method tha n to * can be bad sometimes. Still, it is better to use this method tha n to
* look at \ref totalTime and \ref currentTime to emulate the behav iour * look at totalTime() and currentTime() to emulate the behaviour
* because the backend might have more information available than y our * because the backend might have more information available than y our
* application does through totalTime and currentTime. * application does through totalTime and currentTime.
* *
* \see prefinishMarkReached * \see prefinishMarkReached
*/ */
Q_PROPERTY(qint32 prefinishMark READ prefinishMark WRITE setPrefini shMark) Q_PROPERTY(qint32 prefinishMark READ prefinishMark WRITE setPrefini shMark)
/** /**
* \brief The time interval in milliseconds between two ticks. * \brief The time interval in milliseconds between two ticks.
* *
skipping to change at line 257 skipping to change at line 257
* \endcode * \endcode
* to get a DiscID hash that you can use with the MusicBrainz * to get a DiscID hash that you can use with the MusicBrainz
* service: * service:
* http://musicbrainz.org/doc/ClientHOWTO * http://musicbrainz.org/doc/ClientHOWTO
*/ */
QStringList metaData(const QString &key) const; QStringList metaData(const QString &key) const;
/** /**
* Returns the strings associated with the given \p key. * Returns the strings associated with the given \p key.
* *
* Same as above except that the keys are defined in the \ref * Same as above except that the keys are defined in the
* Phonon::MetaData enum. * Phonon::MetaData enum.
*/ */
QStringList metaData(Phonon::MetaData key) const; QStringList metaData(Phonon::MetaData key) const;
/** /**
* Returns all meta data. * Returns all meta data.
*/ */
QMultiMap<QString, QString> metaData() const; QMultiMap<QString, QString> metaData() const;
/** /**
skipping to change at line 305 skipping to change at line 305
* QUrl url("http://www.example.com/music.ogg"); * QUrl url("http://www.example.com/music.ogg");
* media->setCurrentSource(url); * media->setCurrentSource(url);
* \endcode * \endcode
* *
* \see currentSource * \see currentSource
*/ */
void setCurrentSource(const MediaSource &source); void setCurrentSource(const MediaSource &source);
/** /**
* Returns the queued media sources. This does list does not in clude * Returns the queued media sources. This does list does not in clude
* the current source (returned by \ref currentSource). * the current source (returned by currentSource).
*/ */
QList<MediaSource> queue() const; QList<MediaSource> queue() const;
/** /**
* Set the MediaSources to play when the current media has fini shed. * Set the MediaSources to play when the current media has fini shed.
* *
* This function will overwrite the current queue. * This function will overwrite the current queue.
* *
* \see clearQueue * \see clearQueue
* \see enqueue * \see enqueue
skipping to change at line 398 skipping to change at line 398
qint32 transitionTime() const; qint32 transitionTime() const;
void setTransitionTime(qint32 msec); void setTransitionTime(qint32 msec);
public Q_SLOTS: public Q_SLOTS:
void setTickInterval(qint32 newTickInterval); void setTickInterval(qint32 newTickInterval);
/** /**
* Requests playback of the media data to start. Playback only * Requests playback of the media data to start. Playback only
* starts when stateChanged() signals that it goes into \ref Pl ayingState, * starts when stateChanged() signals that it goes into Playing State,
* though. * though.
* *
* \par Possible states right after this call: * \par Possible states right after this call:
* \li \ref BufferingState * \li BufferingState
* \li \ref PlayingState * \li PlayingState
* \li (\ref ErrorState) * \li ErrorState
*/ */
void play(); void play();
/** /**
* Requests playback to pause. If it was paused before nothing changes. * Requests playback to pause. If it was paused before nothing changes.
* *
* \par Possible states right after this call: * \par Possible states right after this call:
* \li \ref PlayingState * \li PlayingState
* \li \ref PausedState * \li PausedState
* \li (\ref ErrorState) * \li ErrorState
*/ */
void pause(); void pause();
/** /**
* Requests playback to stop. If it was stopped before nothing changes. * Requests playback to stop. If it was stopped before nothing changes.
* *
* \par Possible states right after this call: * \par Possible states right after this call:
* \li the state it was in before (e.g. \ref PlayingState) * \li the state it was in before (e.g. PlayingState)
* \li \ref StoppedState * \li StoppedState
* \li (\ref ErrorState) * \li ErrorState
*/ */
void stop(); void stop();
/** /**
* Requests a seek to the time indicated. * Requests a seek to the time indicated.
* *
* You can only seek if state() == \ref PlayingState, \ref Buff eringState or \ref PausedState. * You can only seek if state() == PlayingState, BufferingState or PausedState.
* *
* The call is asynchronous, so currentTime can still be the ol d * The call is asynchronous, so currentTime can still be the ol d
* value right after this method was called. If all you need is a * value right after this method was called. If all you need is a
* slider that shows the current position and allows the user t o * slider that shows the current position and allows the user t o
* seek use the class SeekSlider. * seek use the class SeekSlider.
* *
* @param time The time in milliseconds where to continue playi ng. * @param time The time in milliseconds where to continue playi ng.
* *
* \par Possible states right after this call: * \par Possible states right after this call:
* \li \ref BufferingState * \li BufferingState
* \li \ref PlayingState * \li PlayingState
* \li (\ref ErrorState) * \li ErrorState
* *
* \see SeekSlider * \see SeekSlider
*/ */
void seek(qint64 time); void seek(qint64 time);
/** /**
* Stops and removes all playing and enqueued media sources. * Stops and removes all playing and enqueued media sources.
* *
* \see setCurrentSource * \see setCurrentSource
*/ */
void clear(); void clear();
Q_SIGNALS: Q_SIGNALS:
/** /**
* Emitted when the state of the MediaObject has changed. * Emitted when the state of the MediaObject has changed.
* In case you're not interested in the old state you can also * 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 State argument.
* *
* @param newstate The state the Player is in now. * @param newstate The state the Player is in now.
* @param oldstate The state the Player was in before. * @param oldstate The state the Player was in before.
*/ */
void stateChanged(Phonon::State newstate, Phonon::State oldstat e); void stateChanged(Phonon::State newstate, Phonon::State oldstat e);
/** /**
* This signal gets emitted every tickInterval milliseconds. * This signal gets emitted every tickInterval milliseconds.
* *
* @param time The position of the media file in milliseconds. * @param time The position of the media file in milliseconds.
skipping to change at line 549 skipping to change at line 549
* emitted when the queue is empty. * emitted when the queue is empty.
* *
* \see currentSourceChanged * \see currentSourceChanged
* \see aboutToFinish * \see aboutToFinish
* \see prefinishMarkReached * \see prefinishMarkReached
*/ */
void finished(); void finished();
/** /**
* Emitted when the MediaObject makes a transition to the next * Emitted when the MediaObject makes a transition to the next
* MediaSource in the \ref queue. * MediaSource in the queue().
* *
* In other words, it is emitted when an individual MediaSource is * In other words, it is emitted when an individual MediaSource is
* finished. * finished.
* *
* \param newSource The source that starts to play at the time the * \param newSource The source that starts to play at the time the
* signal is emitted. * signal is emitted.
*/ */
void currentSourceChanged(const Phonon::MediaSource &newSource) ; void currentSourceChanged(const Phonon::MediaSource &newSource) ;
/** /**
* Emitted before the playback of the whole queue stops. When t his * Emitted before the playback of the whole queue stops. When t his
* signal is emitted you still have time to provide the next * signal is emitted you still have time to provide the next
* MediaSource (using \ref enqueue) so that playback continues. * MediaSource (using enqueue()) so that playback continues.
* *
* This signal can be used to provide the next MediaSource just in * This signal can be used to provide the next MediaSource just in
* time for the transition still to work. * time for the transition still to work.
* *
* \see enqueue * \see enqueue
*/ */
void aboutToFinish(); void aboutToFinish();
/** /**
* Emitted when there are only \p msecToEnd milliseconds left * Emitted when there are only \p msecToEnd milliseconds left
 End of changes. 15 change blocks. 
23 lines changed or deleted 23 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 packetpool.h   packetpool.h 
skipping to change at line 43 skipping to change at line 43
* \note PacketPool and Packet are threadsafe. * \note PacketPool and Packet are threadsafe.
* *
* \author Matthias Kretz <kretz@kde.org> * \author Matthias Kretz <kretz@kde.org>
*/ */
class PHONONEXPERIMENTAL_EXPORT PacketPool class PHONONEXPERIMENTAL_EXPORT PacketPool
{ {
Q_DECLARE_PRIVATE(PacketPool) Q_DECLARE_PRIVATE(PacketPool)
friend class Packet; friend class Packet;
public: public:
/** /**
* Allocates \p numberOfPackets packets of \packetSize bytes each. The memory can be * Allocates \p numberOfPackets packets of \p packetSize bytes each . The memory can be
* accessed through Packet objects. * accessed through Packet objects.
*/ */
PacketPool(int packetSize, int numberOfPackets); PacketPool(int packetSize, int numberOfPackets);
/** /**
* Copy constructor. Copying is fast since the class is explicitly shared. * Copy constructor. Copying is fast since the class is explicitly shared.
*/ */
PacketPool(const PacketPool &); PacketPool(const PacketPool &);
/** /**
* Destructs this object. If this is the last reference to the pool the memory will be * Destructs this object. If this is the last reference to the pool the memory will be
* freed. * freed.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
skipping to change at line 35 skipping to change at line 35
#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 */
# define PHONON_EXPORT Q_DECL_EXPORT # define PHONON_EXPORT Q_DECL_EXPORT
# else /* We are using this library */ # else /* We are using this library */
# define PHONON_EXPORT Q_DECL_IMPORT # define PHONON_EXPORT Q_DECL_IMPORT
# endif # endif
# else /* UNIX */ # else /* UNIX */
# define PHONON_EXPORT Q_DECL_EXPORT # ifdef MAKE_PHONON_LIB /* We are building this library */
# define PHONON_EXPORT Q_DECL_EXPORT
# else /* We are using this library */
# define PHONON_EXPORT Q_DECL_IMPORT
# endif
# endif # endif
#endif #endif
#ifndef PHONON_EXPORT_DEPRECATED #ifndef PHONON_EXPORT_DEPRECATED
# define PHONON_EXPORT_DEPRECATED Q_DECL_DEPRECATED PHONON_EXPORT # define PHONON_EXPORT_DEPRECATED Q_DECL_DEPRECATED PHONON_EXPORT
#endif #endif
// QT_(BEGIN|END)_NAMESPACE appeared in 4.4 // QT_(BEGIN|END)_NAMESPACE appeared in 4.4
#ifndef QT_BEGIN_NAMESPACE #ifndef QT_BEGIN_NAMESPACE
# define QT_BEGIN_NAMESPACE # define QT_BEGIN_NAMESPACE
 End of changes. 2 change blocks. 
2 lines changed or deleted 6 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
skipping to change at line 32 skipping to change at line 32
#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_4
# ifndef PHONON_BACKEND_VERSION_4_3
# define PHONON_BACKEND_VERSION_4_3
# endif
#endif
#ifdef PHONON_BACKEND_VERSION_4_3 #ifdef PHONON_BACKEND_VERSION_4_3
# ifndef PHONON_BACKEND_VERSION_4_2 # ifndef PHONON_BACKEND_VERSION_4_2
# define PHONON_BACKEND_VERSION_4_2 # define PHONON_BACKEND_VERSION_4_2
# endif # endif
#endif #endif
// 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) \
 End of changes. 2 change blocks. 
1 lines changed or deleted 6 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) 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 snapshotinterface.h   snapshotinterface.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 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
skipping to change at line 79 skipping to change at line 79
bool isRunning() const; bool isRunning() const;
Phonon::Experimental::VideoFrame frameForTime(qint64 timestamp); Phonon::Experimental::VideoFrame frameForTime(qint64 timestamp);
public Q_SLOTS: public Q_SLOTS:
void setRunning(bool running); void setRunning(bool running);
void start(); void start();
void stop(); void stop();
Q_SIGNALS: Q_SIGNALS:
/** /* FIXME: disabled this piece of documentation - add another * to e nable
* Fixme: I don't think this makes sense, but I've been wrong befor e. * Fixme: I don't think this makes sense, but I've been wrong befor e.
* *
* Emitted whenever another dataSize number of samples are ready an d * Emitted whenever another dataSize number of samples are ready an d
* format is set to IntegerFormat. * format is set to IntegerFormat.
* *
* If format is set to FloatFormat the signal is not emitted at all . * If format is set to FloatFormat the signal is not emitted at all .
* *
* \param frame An object of class VideoFrame holding the video dat a * \param frame An object of class VideoFrame holding the video dat a
* and some additional information. * and some additional information.
* void frameReady(const Phonon::Experimental::VideoFrame &frame); * void frameReady(const Phonon::Experimental::VideoFrame &frame);
*/ */
/** /**
* The signal is emitted whenever a frame should be displayed. * The signal is emitted whenever a frame should be displayed.
* nowStamp is the current time, outStamp tells the users
* what time the frame should be displayed with.
* *
* The relevant frames should be fetched and displayed using frameF orTime * The relevant frames should be fetched and displayed using frameF orTime
* method. * method.
*
* \param nowStamp the current time
* \param outStamp the time the frame should be displayed with
*/ */
void displayFrame(qint64 nowStamp, qint64 outStamp); void displayFrame(qint64 nowStamp, qint64 outStamp);
/** /**
* This signal is emitted after the last frameReady signal of a * This signal is emitted after the last frameReady signal of a
* media is emitted. * media is emitted.
*/ */
void endOfMedia(); void endOfMedia();
}; };
 End of changes. 4 change blocks. 
4 lines changed or deleted 5 lines changed or added


 videodataoutput2.h   videodataoutput2.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 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 videodataoutputinterface.h   videodataoutputinterface.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 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added


 videoframe2.h   videoframe2.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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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) 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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) 2008 Nokia Corporation and/or its subsidiary(-ies). <thie rry.bastian@trolltech.com> Copyright (C) 2009 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
skipping to change at line 56 skipping to change at line 56
virtual qreal contrast() const = 0; virtual qreal contrast() const = 0;
virtual void setContrast(qreal) = 0; virtual void setContrast(qreal) = 0;
virtual qreal hue() const = 0; virtual qreal hue() const = 0;
virtual void setHue(qreal) = 0; virtual void setHue(qreal) = 0;
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;
}; };
class VideoWidgetInterface44 : public VideoWidgetInterface
{
public:
virtual QImage snapshot() const = 0;
};
} }
#ifdef PHONON_BACKEND_VERSION_4_4
namespace Phonon { typedef VideoWidgetInterface44 VideoWidgetInterfaceLates
t; }
#else
namespace Phonon { typedef VideoWidgetInterface VideoWidgetInterfaceLatest;
}
#endif
Q_DECLARE_INTERFACE(Phonon::VideoWidgetInterface44, "VideoWidgetInterface44
.phonon.kde.org")
Q_DECLARE_INTERFACE(Phonon::VideoWidgetInterface, "VideoWidgetInterface3.ph onon.kde.org") Q_DECLARE_INTERFACE(Phonon::VideoWidgetInterface, "VideoWidgetInterface3.ph onon.kde.org")
#endif //QT_NO_PHONON_VIDEO #endif //QT_NO_PHONON_VIDEO
QT_END_NAMESPACE QT_END_NAMESPACE
QT_END_HEADER QT_END_HEADER
#endif // PHONON_VIDEOWIDGETINTERFACE_H #endif // PHONON_VIDEOWIDGETINTERFACE_H
 End of changes. 4 change blocks. 
2 lines changed or deleted 18 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 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) 2008 Nokia Corporation and/or its subsidiary(-ies). <thie rry.bastian@trolltech.com> Copyright (C) 2009 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 2 change blocks. 
2 lines changed or deleted 2 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 Lesser 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.1 of the License, or (at your option) version 3, or any 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 later version accepted by the membership of KDE e.V. (or its
successor approved by the membership of KDE e.V.), Trolltech ASA successor approved by the membership of KDE e.V.), Nokia Corporation
(or its successors, if any) and the KDE Free Qt Foundation, which shall (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. 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
Lesser General Public License for more details. Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public You should have received a copy of the GNU Lesser General Public
License along with this library. If not, see <http://www.gnu.org/licen ses/>. License along with this library. If not, see <http://www.gnu.org/licen ses/>.
 End of changes. 1 change blocks. 
1 lines changed or deleted 1 lines changed or added

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