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

List:       kde-commits
Subject:    extragear/network/ktorrent
From:       Joris Guisson <joris.guisson () gmail ! com>
Date:       2010-11-11 11:36:01
Message-ID: 20101111113601.9E8E4AC89E () svn ! kde ! org
[Download RAW message or body]

SVN commit 1195512 by guisson:

Fix bug in media player plugin causing stream to not start playing when streaming is \
started when nothing is downloaded yet.

 M  +1 -1      ktorrent/tools/queuemanagerwidget.cpp  
 M  +6 -9      plugins/mediaplayer/mediaplayer.cpp  
 M  +1 -1      plugins/mediaplayer/mediaplayer.h  


--- trunk/extragear/network/ktorrent/ktorrent/tools/queuemanagerwidget.cpp \
#1195511:1195512 @@ -60,7 +60,7 @@
 		search->hide();
 		vbox->addWidget(search);
 		vbox->addWidget(view);
-		layout->addItem(vbox);
+		layout->addLayout(vbox);
 		
 		show_search = toolbar->addAction(KIcon("edit-find"),i18n("Show Search"));
 		show_search->setToolTip(i18n("Show or hide the search bar"));
--- trunk/extragear/network/ktorrent/plugins/mediaplayer/mediaplayer.cpp \
#1195511:1195512 @@ -33,7 +33,7 @@
 {
 
 	MediaPlayer::MediaPlayer(QObject* parent) 
-		: QObject(parent),buffering(false),resume_when_buffering_finished(true)
+		: QObject(parent),buffering(false),manually_paused(false)
 	{
 		media = new Phonon::MediaObject(this);
 		audio = new Phonon::AudioOutput(Phonon::MusicCategory, this);
@@ -62,7 +62,7 @@
 		if (paused())
 		{
 			if (buffering)
-				resume_when_buffering_finished = true;
+				manually_paused = false;
 			else
 				media->play();
 		}
@@ -73,7 +73,7 @@
 		if (media->state() == Phonon::PausedState)
 		{
 			if (buffering)
-				resume_when_buffering_finished = true;
+				manually_paused = false;
 			else
 				media->play();
 		}
@@ -109,7 +109,7 @@
 		}
 		else
 		{
-			resume_when_buffering_finished = false;
+			manually_paused = true;
 			if (media->state() == Phonon::PausedState)
 			{
 				Out(SYS_MPL|LOG_DEBUG) << "MediaPlayer: paused" << endl;
@@ -220,19 +220,16 @@
 	
 	void MediaPlayer::streamStateChanged(MediaFileStream::StreamState state)
 	{
+		Out(SYS_MPL|LOG_DEBUG) << "Stream state changed: " << (state == \
MediaFileStream::BUFFERING ? "BUFFERING" : "PLAYING") << endl;  if (state == \
MediaFileStream::BUFFERING)  {
 			buffering = true;
-			if (media->state() == Phonon::PlayingState || media->state() == \
                Phonon::BufferingState)
-				resume_when_buffering_finished = true;
-			else
-				resume_when_buffering_finished = false;
 			media->pause();
 		}
 		else if (buffering)
 		{
 			buffering = false;
-			if (resume_when_buffering_finished)
+			if (!manually_paused)
 				media->play();
 		}
 	}
--- trunk/extragear/network/ktorrent/plugins/mediaplayer/mediaplayer.h \
#1195511:1195512 @@ -120,7 +120,7 @@
 		Phonon::AudioOutput* audio;
 		QList<MediaFileRef> history;
 		bool buffering;
-		bool resume_when_buffering_finished;
+		bool manually_paused;
 	};
 
 }


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