[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    =?utf-8?q?=5Bkaffeine=5D_src=3A_cleanups?=
From:       Christoph Pfister <christophpfister () gmail ! com>
Date:       2011-04-30 17:14:41
Message-ID: 20110430171441.75B36A60A4 () git ! kde ! org
[Download RAW message or body]

Git commit a248ae702bdea8fe8c6af9d76dbf7126bac28544 by Christoph Pfister.
Committed on 30/04/2011 at 19:14.
Pushed by pfister into branch 'master'.

cleanups

M  +0    -2    src/backend-vlc/vlcmediawidget.cpp     
M  +3    -3    src/dvb/dvbliveview.cpp     
M  +1    -1    src/mainwindow.cpp     
M  +0    -3    src/mainwindow.h     
M  +6    -2    src/mediawidget.cpp     

http://commits.kde.org/kaffeine/a248ae702bdea8fe8c6af9d76dbf7126bac28544

diff --git a/src/backend-vlc/vlcmediawidget.cpp b/src/backend-vlc/vlcmediawidget.cpp
index a86a304..15a860e 100644
--- a/src/backend-vlc/vlcmediawidget.cpp
+++ b/src/backend-vlc/vlcmediawidget.cpp
@@ -484,8 +484,6 @@ void VlcMediaWidget::customEvent(QEvent *event)
 				track = track->p_next;
 			}
 
-			Log("VlcMediaWidget::customEvent: number of audio channels") << \
                audioChannels.size();
-			Log("XXX:") << libvlc_audio_get_track_count(vlcMediaPlayer);
 			int currentAudioChannel = libvlc_audio_get_track(vlcMediaPlayer);
 			emit updateAudioChannels(audioChannels, currentAudioChannel);
 			break;
diff --git a/src/dvb/dvbliveview.cpp b/src/dvb/dvbliveview.cpp
index 5a63789..5e399cc 100644
--- a/src/dvb/dvbliveview.cpp
+++ b/src/dvb/dvbliveview.cpp
@@ -544,21 +544,21 @@ DvbLiveViewInternal::DvbLiveViewInternal() : mediaWidget(NULL), \
readFd(-1), writ  url.setScheme("fifo");
 
 	if (mkfifo(QFile::encodeName(fileName).constData(), 0600) != 0) {
-		Log("timeShiftActive: mkfifo failed");
+		Log("DvbLiveViewInternal::DvbLiveViewInternal: mkfifo failed");
 		return;
 	}
 
 	readFd = open(QFile::encodeName(fileName).constData(), O_RDONLY | O_NONBLOCK);
 
 	if (readFd < 0) {
-		Log("timeShiftActive: open failed");
+		Log("DvbLiveViewInternal::DvbLiveViewInternal: open failed");
 		return;
 	}
 
 	writeFd = open(QFile::encodeName(fileName).constData(), O_WRONLY | O_NONBLOCK);
 
 	if (writeFd < 0) {
-		Log("timeShiftActive: open failed");
+		Log("DvbLiveViewInternal::DvbLiveViewInternal: open failed");
 		return;
 	}
 
diff --git a/src/mainwindow.cpp b/src/mainwindow.cpp
index 3e33456..3c576b1 100644
--- a/src/mainwindow.cpp
+++ b/src/mainwindow.cpp
@@ -673,7 +673,7 @@ bool MainWindow::event(QEvent *event)
 
 	// FIXME we depend on QEvent::HoverMove (instead of QEvent::MouseMove)
 	// but the latter depends on mouse tracking being enabled on this widget
-	// and all its children (especially the phonon video widget) ...
+	// and all its children (especially the video widget) ...
 
 	if ((event->type() == QEvent::HoverMove) && autoHideControlBar) {
 		int y = reinterpret_cast<QHoverEvent *> (event)->pos().y();
diff --git a/src/mainwindow.h b/src/mainwindow.h
index 5bddb60..6b5c0cd 100644
--- a/src/mainwindow.h
+++ b/src/mainwindow.h
@@ -25,13 +25,10 @@
 #include "mediawidget.h"
 
 class QStackedLayout;
-class KActionCollection;
 class KCmdLineOptions;
 class KRecentFilesAction;
 class KTabBar;
-class KUrl;
 class DvbTab;
-class MediaWidget;
 class PlayerTab;
 class PlaylistTab;
 class TabBase;
diff --git a/src/mediawidget.cpp b/src/mediawidget.cpp
index 7a3bb43..c1b7325 100644
--- a/src/mediawidget.cpp
+++ b/src/mediawidget.cpp
@@ -44,8 +44,12 @@
 #include "osdwidget.h"
 
 MediaWidget::MediaWidget(KMenu *menu_, KToolBar *toolBar, KActionCollection \
                *collection,
-	QWidget *parent) : QWidget(parent), menu(menu_),
-	backendPlaybackStatus(Idle), displayMode(NormalMode), automaticResize(ResizeOff), \
source(Playlist), blockBackendUpdates(false), muted(false), \
screenSaverSuspended(false), backendTotalTime(0), backendCurrentTime(0), \
showElapsedTime(true), backendSeekable(false), currentBackendAudioChannel(-1), \
currentDvbAudioChannel(-1), currentBackendSubtitle(-1), currentDvbSubtitle(-1), \
currentExternalSubtitle(-1) +	QWidget *parent) : QWidget(parent), menu(menu_), \
backendPlaybackStatus(Idle), +	displayMode(NormalMode), automaticResize(ResizeOff), \
source(Playlist), +	blockBackendUpdates(false), muted(false), \
screenSaverSuspended(false), backendTotalTime(0), +	backendCurrentTime(0), \
showElapsedTime(true), backendSeekable(false), +	currentBackendAudioChannel(-1), \
currentDvbAudioChannel(-1), currentBackendSubtitle(-1), +	currentDvbSubtitle(-1), \
currentExternalSubtitle(-1)  {
 	QBoxLayout *layout = new QVBoxLayout(this);
 	layout->setMargin(0);


[prev in list] [next in list] [prev in thread] [next in thread]