summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-08-15 19:06:52 (UTC)
committer harlekin <harlekin>2002-08-15 19:06:52 (UTC)
commitcff42f8a8808ef9fd9b65376649857e0e0c2ccc3 (patch) (side-by-side diff)
tree7cf3cca6b2ebb35cd9ffc0ce8adc5568a27ad7d7
parent8cd40434c7011022a8e1706698e5c5075681bd1e (diff)
downloadopie-cff42f8a8808ef9fd9b65376649857e0e0c2ccc3.zip
opie-cff42f8a8808ef9fd9b65376649857e0e0c2ccc3.tar.gz
opie-cff42f8a8808ef9fd9b65376649857e0e0c2ccc3.tar.bz2
stop now working as supposed
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/lib.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp4
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp8
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp2
4 files changed, 8 insertions, 7 deletions
diff --git a/noncore/multimedia/opieplayer2/lib.cpp b/noncore/multimedia/opieplayer2/lib.cpp
index 3b20873..d554141 100644
--- a/noncore/multimedia/opieplayer2/lib.cpp
+++ b/noncore/multimedia/opieplayer2/lib.cpp
@@ -171,6 +171,7 @@ int Lib::play( const QString& fileName,
startPos, start_time);
}
void Lib::stop() {
+ qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>");
xine_stop(m_xine );
}
void Lib::pause(){
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 51fbb8b..93819f2 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -48,7 +48,7 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name )
connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) );
connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) );
connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) );
-
+
volControl = new VolumeControl;
}
@@ -71,7 +71,7 @@ void MediaPlayer::play() {
void MediaPlayer::setPlaying( bool play ) {
if ( !play ) {
- mediaPlayerState->setPaused( FALSE );
+ //mediaPlayerState->setPaused( TRUE );
return;
}
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index c210ffb..77e2095 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -685,7 +685,7 @@ void PlayListWidget::removeSelected() {
}
void PlayListWidget::playIt( QListViewItem *it) {
- if(it==NULL) return;
+ // if(it==NULL) return;
qDebug("playIt");
mediaPlayerState->setPlaying(FALSE);
mediaPlayerState->setPlaying(TRUE);
@@ -1233,13 +1233,13 @@ qDebug("%d", index);
switch(index) {
case -16:
{
-
+
mediaPlayerState->toggleFullscreen();
bool b=mediaPlayerState->fullscreen();
pmView->setItemChecked( index,b);
Config cfg( "OpiePlayer" );
cfg.writeEntry("FullScreen", b);
-
+
}
break;
};
@@ -1268,7 +1268,7 @@ void PlayListWidget::populateSkinsMenu() {
defaultSkinIndex = item;
if( skinName == skin)
skinsMenu->setItemChecked( item, TRUE);
-
+
++it;
}
}
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 17112a2..8fd2743 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -116,7 +116,7 @@ void XineControl::stop( bool isSet ) {
if ( !isSet) {
libXine->stop( );
mediaPlayerState->setList();
- //mediaPlayerState->setPlaying( false );
+ // mediaPlayerState->setPlaying( false );
#if defined(Q_WS_QWS) && !defined(QT_NO_COP)
if ( disabledSuspendScreenSaver ) {