author | llornkcor <llornkcor> | 2002-03-20 02:07:17 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-03-20 02:07:17 (UTC) |
commit | ea1f3581a3452f735bb0cf5703b9bf1b20316b71 (patch) (unidiff) | |
tree | ad31a417eee542534b42ed229d70cae834414e9d /core/multimedia/opieplayer/playlistwidget.cpp | |
parent | 25653ee75580cdd24a16e82abe7271c9402429c7 (diff) | |
download | opie-ea1f3581a3452f735bb0cf5703b9bf1b20316b71.zip opie-ea1f3581a3452f735bb0cf5703b9bf1b20316b71.tar.gz opie-ea1f3581a3452f735bb0cf5703b9bf1b20316b71.tar.bz2 |
added slight workaround for audio/video playig continuing in playlist
Diffstat (limited to 'core/multimedia/opieplayer/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index cf665c8..db6533a 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -162,25 +162,25 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
162 | fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0); | 162 | fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0); |
163 | connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); | 163 | connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); |
164 | fullScreenButton->addTo(pmView); | 164 | fullScreenButton->addTo(pmView); |
165 | scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("mpegplayer/scale"), QString::null, 0, this, 0); | 165 | scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("mpegplayer/scale"), QString::null, 0, this, 0); |
166 | connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); | 166 | connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); |
167 | scaleButton->addTo(pmView); | 167 | scaleButton->addTo(pmView); |
168 | 168 | ||
169 | QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); | 169 | QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); |
170 | QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); | 170 | QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); |
171 | 171 | ||
172 | QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); | 172 | QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); |
173 | 173 | ||
174 | tabWidget = new QTabWidget( hbox6, "tabWidget" ); | 174 | tabWidget = new QTabWidget( hbox6, "tabWidget" ); |
175 | tabWidget->setTabShape(QTabWidget::Triangular); | 175 | tabWidget->setTabShape(QTabWidget::Triangular); |
176 | 176 | ||
177 | QWidget *pTab; | 177 | QWidget *pTab; |
178 | pTab = new QWidget( tabWidget, "pTab" ); | 178 | pTab = new QWidget( tabWidget, "pTab" ); |
179 | // playlistView = new QListView( pTab, "playlistview" ); | 179 | // playlistView = new QListView( pTab, "playlistview" ); |
180 | // playlistView->setMinimumSize(236,260); | 180 | // playlistView->setMinimumSize(236,260); |
181 | tabWidget->insertTab( pTab,"Playlist"); | 181 | tabWidget->insertTab( pTab,"Playlist"); |
182 | 182 | ||
183 | 183 | ||
184 | // Add the playlist area | 184 | // Add the playlist area |
185 | 185 | ||
186 | QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton ); | 186 | QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton ); |
@@ -473,36 +473,36 @@ void PlayListWidget::useSelectedDocument() { | |||
473 | } | 473 | } |
474 | 474 | ||
475 | 475 | ||
476 | const DocLnk *PlayListWidget::current() { // this is fugly | 476 | const DocLnk *PlayListWidget::current() { // this is fugly |
477 | 477 | ||
478 | // if( fromSetDocument) { | 478 | // if( fromSetDocument) { |
479 | // qDebug("from setDoc"); | 479 | // qDebug("from setDoc"); |
480 | // DocLnkSet files; | 480 | // DocLnkSet files; |
481 | // Global::findDocuments(&files, "video/*;audio/*"); | 481 | // Global::findDocuments(&files, "video/*;audio/*"); |
482 | // QListIterator<DocLnk> dit( files.children() ); | 482 | // QListIterator<DocLnk> dit( files.children() ); |
483 | // for ( ; dit.current(); ++dit ) { | 483 | // for ( ; dit.current(); ++dit ) { |
484 | // if(dit.current()->linkFile() == setDocFileRef) { | 484 | // if(dit.current()->linkFile() == setDocFileRef) { |
485 | // qDebug(setDocFileRef); | 485 | // qDebug(setDocFileRef); |
486 | // return dit; | 486 | // return dit; |
487 | // } | 487 | // } |
488 | // } | 488 | // } |
489 | // } else | 489 | // } else |
490 | // qDebug("current"); | 490 | // qDebug("current"); |
491 | // switch (tabWidget->currentPageIndex()) { | 491 | // switch (tabWidget->currentPageIndex()) { |
492 | // case 0: //playlist | 492 | // case 0: //playlist |
493 | // { | 493 | // { |
494 | qDebug("playlist"); | 494 | qDebug("playlist"); |
495 | if ( mediaPlayerState->playlist() ) { | 495 | if ( mediaPlayerState->playlist() ) { |
496 | return d->selectedFiles->current(); | 496 | return d->selectedFiles->current(); |
497 | } | 497 | } |
498 | else if ( d->setDocumentUsed && d->current ) { | 498 | else if ( d->setDocumentUsed && d->current ) { |
499 | return d->current; | 499 | return d->current; |
500 | } else { | 500 | } else { |
501 | return d->files->selected(); | 501 | return d->files->selected(); |
502 | } | 502 | } |
503 | // } | 503 | // } |
504 | // break; | 504 | // break; |
505 | // case 1://audio | 505 | // case 1://audio |
506 | // { | 506 | // { |
507 | // qDebug("audioView"); | 507 | // qDebug("audioView"); |
508 | // Global::findDocuments(&files, "audio/*"); | 508 | // Global::findDocuments(&files, "audio/*"); |
@@ -804,34 +804,36 @@ void PlayListWidget::btnPlay(bool b) { | |||
804 | case 0: | 804 | case 0: |
805 | { | 805 | { |
806 | mediaPlayerState->setPlaying(b); | 806 | mediaPlayerState->setPlaying(b); |
807 | } | 807 | } |
808 | break; | 808 | break; |
809 | case 1: | 809 | case 1: |
810 | { | 810 | { |
811 | addToSelection( audioView->selectedItem() ); | 811 | addToSelection( audioView->selectedItem() ); |
812 | mediaPlayerState->setPlaying(b); | 812 | mediaPlayerState->setPlaying(b); |
813 | // qApp->processEvents(); | 813 | // qApp->processEvents(); |
814 | d->selectedFiles->removeSelected( ); | 814 | d->selectedFiles->removeSelected( ); |
815 | tabWidget->setCurrentPage(1); | 815 | tabWidget->setCurrentPage(1); |
816 | d->selectedFiles->unSelect(); | ||
816 | // mediaPlayerState->setPlaying(FALSE); | 817 | // mediaPlayerState->setPlaying(FALSE); |
817 | } | 818 | } |
818 | break; | 819 | break; |
819 | case 2: | 820 | case 2: |
820 | { | 821 | { |
821 | addToSelection( videoView->selectedItem() ); | 822 | addToSelection( videoView->selectedItem() ); |
822 | mediaPlayerState->setPlaying(b); | 823 | mediaPlayerState->setPlaying(b); |
823 | qApp->processEvents(); | 824 | qApp->processEvents(); |
824 | d->selectedFiles->removeSelected( ); | 825 | d->selectedFiles->removeSelected( ); |
825 | tabWidget->setCurrentPage(2); | 826 | tabWidget->setCurrentPage(2); |
827 | d->selectedFiles->unSelect(); | ||
826 | // mediaPlayerState->setPlaying(FALSE); | 828 | // mediaPlayerState->setPlaying(FALSE); |
827 | } | 829 | } |
828 | break; | 830 | break; |
829 | }; | 831 | }; |
830 | 832 | ||
831 | 833 | ||
832 | 834 | ||
833 | 835 | ||
834 | } | 836 | } |
835 | 837 | ||
836 | void PlayListWidget::deletePlaylist() { | 838 | void PlayListWidget::deletePlaylist() { |
837 | switch( QMessageBox::information( this, (tr("Remove Playlist?")), | 839 | switch( QMessageBox::information( this, (tr("Remove Playlist?")), |