-rw-r--r-- | noncore/multimedia/opieplayer2/lib.cpp | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/mediaplayer.cpp | 4 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 8 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/xinecontrol.cpp | 2 |
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 | |||
@@ -168,12 +168,13 @@ int Lib::play( const QString& fileName, | |||
168 | if (str.right(1) == QString::fromLatin1("/") ) | 168 | if (str.right(1) == QString::fromLatin1("/") ) |
169 | str = str.mid( str.length() -1 ); | 169 | str = str.mid( str.length() -1 ); |
170 | return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(), | 170 | return xine_play( m_xine, QFile::encodeName(str.utf8() ).data(), |
171 | startPos, start_time); | 171 | startPos, start_time); |
172 | } | 172 | } |
173 | void Lib::stop() { | 173 | void Lib::stop() { |
174 | qDebug("<<<<<<<< STOP IN LIB TRIGGERED >>>>>>>"); | ||
174 | xine_stop(m_xine ); | 175 | xine_stop(m_xine ); |
175 | } | 176 | } |
176 | void Lib::pause(){ | 177 | void Lib::pause(){ |
177 | xine_set_speed( m_xine, SPEED_PAUSE ); | 178 | xine_set_speed( m_xine, SPEED_PAUSE ); |
178 | } | 179 | } |
179 | int Lib::speed() { | 180 | int Lib::speed() { |
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 | |||
@@ -45,13 +45,13 @@ MediaPlayer::MediaPlayer( QObject *parent, const char *name ) | |||
45 | connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); | 45 | connect( audioUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); |
46 | 46 | ||
47 | connect( videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); | 47 | connect( videoUI, SIGNAL( moreClicked() ), this, SLOT( startIncreasingVolume() ) ); |
48 | connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); | 48 | connect( videoUI, SIGNAL( lessClicked() ), this, SLOT( startDecreasingVolume() ) ); |
49 | connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); | 49 | connect( videoUI, SIGNAL( moreReleased() ), this, SLOT( stopChangingVolume() ) ); |
50 | connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); | 50 | connect( videoUI, SIGNAL( lessReleased() ), this, SLOT( stopChangingVolume() ) ); |
51 | 51 | ||
52 | volControl = new VolumeControl; | 52 | volControl = new VolumeControl; |
53 | 53 | ||
54 | } | 54 | } |
55 | 55 | ||
56 | MediaPlayer::~MediaPlayer() { | 56 | MediaPlayer::~MediaPlayer() { |
57 | delete xineControl; | 57 | delete xineControl; |
@@ -68,13 +68,13 @@ void MediaPlayer::play() { | |||
68 | mediaPlayerState->setPlaying( FALSE ); | 68 | mediaPlayerState->setPlaying( FALSE ); |
69 | mediaPlayerState->setPlaying( TRUE ); | 69 | mediaPlayerState->setPlaying( TRUE ); |
70 | } | 70 | } |
71 | 71 | ||
72 | void MediaPlayer::setPlaying( bool play ) { | 72 | void MediaPlayer::setPlaying( bool play ) { |
73 | if ( !play ) { | 73 | if ( !play ) { |
74 | mediaPlayerState->setPaused( FALSE ); | 74 | //mediaPlayerState->setPaused( TRUE ); |
75 | return; | 75 | return; |
76 | } | 76 | } |
77 | 77 | ||
78 | if ( mediaPlayerState->paused() ) { | 78 | if ( mediaPlayerState->paused() ) { |
79 | mediaPlayerState->setPaused( FALSE ); | 79 | mediaPlayerState->setPaused( FALSE ); |
80 | return; | 80 | 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 | |||
@@ -682,13 +682,13 @@ void PlayListWidget::addSelected() { | |||
682 | 682 | ||
683 | void PlayListWidget::removeSelected() { | 683 | void PlayListWidget::removeSelected() { |
684 | d->selectedFiles->removeSelected( ); | 684 | d->selectedFiles->removeSelected( ); |
685 | } | 685 | } |
686 | 686 | ||
687 | void PlayListWidget::playIt( QListViewItem *it) { | 687 | void PlayListWidget::playIt( QListViewItem *it) { |
688 | if(it==NULL) return; | 688 | // if(it==NULL) return; |
689 | qDebug("playIt"); | 689 | qDebug("playIt"); |
690 | mediaPlayerState->setPlaying(FALSE); | 690 | mediaPlayerState->setPlaying(FALSE); |
691 | mediaPlayerState->setPlaying(TRUE); | 691 | mediaPlayerState->setPlaying(TRUE); |
692 | d->selectedFiles->unSelect(); | 692 | d->selectedFiles->unSelect(); |
693 | } | 693 | } |
694 | 694 | ||
@@ -1230,19 +1230,19 @@ void PlayListWidget::readPls(const QString &filename) { | |||
1230 | 1230 | ||
1231 | void PlayListWidget::pmViewActivated(int index) { | 1231 | void PlayListWidget::pmViewActivated(int index) { |
1232 | qDebug("%d", index); | 1232 | qDebug("%d", index); |
1233 | switch(index) { | 1233 | switch(index) { |
1234 | case -16: | 1234 | case -16: |
1235 | { | 1235 | { |
1236 | 1236 | ||
1237 | mediaPlayerState->toggleFullscreen(); | 1237 | mediaPlayerState->toggleFullscreen(); |
1238 | bool b=mediaPlayerState->fullscreen(); | 1238 | bool b=mediaPlayerState->fullscreen(); |
1239 | pmView->setItemChecked( index,b); | 1239 | pmView->setItemChecked( index,b); |
1240 | Config cfg( "OpiePlayer" ); | 1240 | Config cfg( "OpiePlayer" ); |
1241 | cfg.writeEntry("FullScreen", b); | 1241 | cfg.writeEntry("FullScreen", b); |
1242 | 1242 | ||
1243 | } | 1243 | } |
1244 | break; | 1244 | break; |
1245 | }; | 1245 | }; |
1246 | } | 1246 | } |
1247 | 1247 | ||
1248 | void PlayListWidget::populateSkinsMenu() { | 1248 | void PlayListWidget::populateSkinsMenu() { |
@@ -1265,13 +1265,13 @@ void PlayListWidget::populateSkinsMenu() { | |||
1265 | if( skinName != "." && skinName != ".." && skinName !="CVS") | 1265 | if( skinName != "." && skinName != ".." && skinName !="CVS") |
1266 | item = skinsMenu->insertItem( fi->fileName()); | 1266 | item = skinsMenu->insertItem( fi->fileName()); |
1267 | if( skinName == "default") | 1267 | if( skinName == "default") |
1268 | defaultSkinIndex = item; | 1268 | defaultSkinIndex = item; |
1269 | if( skinName == skin) | 1269 | if( skinName == skin) |
1270 | skinsMenu->setItemChecked( item, TRUE); | 1270 | skinsMenu->setItemChecked( item, TRUE); |
1271 | 1271 | ||
1272 | ++it; | 1272 | ++it; |
1273 | } | 1273 | } |
1274 | } | 1274 | } |
1275 | 1275 | ||
1276 | void PlayListWidget::skinsMenuActivated(int item) { | 1276 | void PlayListWidget::skinsMenuActivated(int item) { |
1277 | for(int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i--) { | 1277 | for(int i = defaultSkinIndex; i > defaultSkinIndex - skinsMenu->count(); i--) { |
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 | |||
@@ -113,13 +113,13 @@ void XineControl::nextMedia() { | |||
113 | } | 113 | } |
114 | 114 | ||
115 | void XineControl::stop( bool isSet ) { | 115 | void XineControl::stop( bool isSet ) { |
116 | if ( !isSet) { | 116 | if ( !isSet) { |
117 | libXine->stop( ); | 117 | libXine->stop( ); |
118 | mediaPlayerState->setList(); | 118 | mediaPlayerState->setList(); |
119 | //mediaPlayerState->setPlaying( false ); | 119 | // mediaPlayerState->setPlaying( false ); |
120 | 120 | ||
121 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) | 121 | #if defined(Q_WS_QWS) && !defined(QT_NO_COP) |
122 | if ( disabledSuspendScreenSaver ) { | 122 | if ( disabledSuspendScreenSaver ) { |
123 | disabledSuspendScreenSaver = FALSE; | 123 | disabledSuspendScreenSaver = FALSE; |
124 | // Re-enable the suspend mode | 124 | // Re-enable the suspend mode |
125 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; | 125 | QCopEnvelope("QPE/System", "setScreenSaverMode(int)" ) << QPEApplication::Enable; |