"Fossies" - the Fresh Open Source Software Archive  

Source code changes of the file "src/dvb/dvbliveview_p.h" between
kaffeine-2.0.16.tar.gz and kaffeine-2.0.17.tar.gz

About: Kaffeine is a full featured Multimedia-Player for KDE (default backend is xine).

dvbliveview_p.h  (kaffeine-2.0.16)	:	dvbliveview_p.h  (kaffeine-2.0.17)
skipping to change at line 68		skipping to change at line 68
class DvbLiveViewInternal : public QObject, public DvbPidFilter, public MediaSou rce		class DvbLiveViewInternal : public QObject, public DvbPidFilter, public MediaSou rce
{		{
Q_OBJECT		Q_OBJECT
public:		public:
explicit DvbLiveViewInternal(QObject *parent);		explicit DvbLiveViewInternal(QObject *parent);
~DvbLiveViewInternal();		~DvbLiveViewInternal();
void resetPipe();		void resetPipe();
MediaWidget *mediaWidget;
QString channelName;
DvbPmtFilter pmtFilter;
QByteArray pmtSectionData;
DvbSectionGenerator patGenerator;
DvbSectionGenerator pmtGenerator;
QByteArray buffer;
QFile timeShiftFile;
QString fileName;
DvbOsd dvbOsd;
bool emptyBuffer;
QTime startTime;
bool overrideAudioStreams() const { return !audioStreams.isEmpty(); }		bool overrideAudioStreams() const { return !audioStreams.isEmpty(); }
QStringList getAudioStreams() const { return audioStreams; }		QStringList getAudioStreams() const { return audioStreams; }
QStringList getSubtitles() const { return QStringList(); }		QStringList getSubtitles() const { return QStringList(); }
int getCurrentAudioStream() const { return currentAudioStream; }		int getCurrentAudioStream() const { return currentAudioStream; }
int getCurrentSubtitle() const { return currentSubtitle; }		int getCurrentSubtitle() const { return currentSubtitle; }
void setCurrentAudioStream(int currentAudioStream_)		void setCurrentAudioStream(int currentAudioStream_)
{		{
currentAudioStream = currentAudioStream_;		currentAudioStream = currentAudioStream_;
emit currentAudioStreamChanged(currentAudioStream);		emit currentAudioStreamChanged(currentAudioStream);
skipping to change at line 117		skipping to change at line 104
void updateUrl() {		void updateUrl() {
if (timeShiftFile.isOpen())		if (timeShiftFile.isOpen())
url = QUrl::fromLocalFile(timeShiftFile.fileName());		url = QUrl::fromLocalFile(timeShiftFile.fileName());
else		else
url = QUrl::fromLocalFile(fileName);		url = QUrl::fromLocalFile(fileName);
}		}
virtual void validateCurrentTotalTime(int &currentTime, int &totalTime) c onst;		virtual void validateCurrentTotalTime(int &currentTime, int &totalTime) c onst;
bool hideCurrentTotalTime() const { return !timeshift; }		bool hideCurrentTotalTime() const { return !timeshift; }
		MediaWidget *mediaWidget;
		QString channelName;
		DvbPmtFilter pmtFilter;
		QByteArray pmtSectionData;
		DvbSectionGenerator patGenerator;
		DvbSectionGenerator pmtGenerator;
		QByteArray buffer;
		QFile timeShiftFile;
		QString fileName;
		DvbOsd dvbOsd;
		bool emptyBuffer;
		QTime startTime;
bool timeshift;		bool timeshift;
QStringList audioStreams;		QStringList audioStreams;
int currentAudioStream;		int currentAudioStream;
int currentSubtitle;		int currentSubtitle;
int retryCounter;		int retryCounter;
signals:		signals:
void currentAudioStreamChanged(int currentAudioStream);		void currentAudioStreamChanged(int currentAudioStream);
void currentSubtitleChanged(int currentSubtitle);		void currentSubtitleChanged(int currentSubtitle);
void replay();		void replay();
End of changes. 2 change blocks.
13 lines changed or deleted		12 lines changed or added

---