author | llornkcor <llornkcor> | 2002-04-20 18:53:33 (UTC) |
---|---|---|
committer | llornkcor <llornkcor> | 2002-04-20 18:53:33 (UTC) |
commit | b8bdd6ceaab890f8b35492a11e13bcdb101b1220 (patch) (unidiff) | |
tree | 1ba128f600c5b0e5f2b0dce459b77270287e59ca /core/multimedia | |
parent | 703c9c483b5e3fa6d2090398d6ee3a5638326b02 (diff) | |
download | opie-b8bdd6ceaab890f8b35492a11e13bcdb101b1220.zip opie-b8bdd6ceaab890f8b35492a11e13bcdb101b1220.tar.gz opie-b8bdd6ceaab890f8b35492a11e13bcdb101b1220.tar.bz2 |
changed MediaPlayer to OpiePlayer in config stuff
-rw-r--r-- | core/multimedia/opieplayer/mediaplayerstate.cpp | 4 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 12 |
2 files changed, 8 insertions, 8 deletions
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp index a960c49..4e14436 100644 --- a/core/multimedia/opieplayer/mediaplayerstate.cpp +++ b/core/multimedia/opieplayer/mediaplayerstate.cpp | |||
@@ -33,32 +33,32 @@ | |||
33 | #include "libmad/libmadpluginimpl.h" | 33 | #include "libmad/libmadpluginimpl.h" |
34 | #include "libmpeg3/libmpeg3pluginimpl.h" | 34 | #include "libmpeg3/libmpeg3pluginimpl.h" |
35 | #include "wavplugin/wavpluginimpl.h" | 35 | #include "wavplugin/wavpluginimpl.h" |
36 | #endif | 36 | #endif |
37 | 37 | ||
38 | 38 | ||
39 | //#define MediaPlayerDebug(x) qDebug x | 39 | //#define MediaPlayerDebug(x) qDebug x |
40 | #define MediaPlayerDebug(x) | 40 | #define MediaPlayerDebug(x) |
41 | 41 | ||
42 | 42 | ||
43 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) | 43 | MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) |
44 | : QObject( parent, name ), decoder( NULL ), libmpeg3decoder( NULL ) { | 44 | : QObject( parent, name ), decoder( NULL ), libmpeg3decoder( NULL ) { |
45 | Config cfg( "MediaPlayer" ); | 45 | Config cfg( "OpiePlayer" ); |
46 | readConfig( cfg ); | 46 | readConfig( cfg ); |
47 | loadPlugins(); | 47 | loadPlugins(); |
48 | } | 48 | } |
49 | 49 | ||
50 | 50 | ||
51 | MediaPlayerState::~MediaPlayerState() { | 51 | MediaPlayerState::~MediaPlayerState() { |
52 | Config cfg( "MediaPlayer" ); | 52 | Config cfg( "OpiePlayer" ); |
53 | writeConfig( cfg ); | 53 | writeConfig( cfg ); |
54 | } | 54 | } |
55 | 55 | ||
56 | 56 | ||
57 | void MediaPlayerState::readConfig( Config& cfg ) { | 57 | void MediaPlayerState::readConfig( Config& cfg ) { |
58 | cfg.setGroup("Options"); | 58 | cfg.setGroup("Options"); |
59 | isFullscreen = cfg.readBoolEntry( "FullScreen" ); | 59 | isFullscreen = cfg.readBoolEntry( "FullScreen" ); |
60 | isScaled = cfg.readBoolEntry( "Scaling" ); | 60 | isScaled = cfg.readBoolEntry( "Scaling" ); |
61 | isLooping = cfg.readBoolEntry( "Looping" ); | 61 | isLooping = cfg.readBoolEntry( "Looping" ); |
62 | isShuffled = cfg.readBoolEntry( "Shuffle" ); | 62 | isShuffled = cfg.readBoolEntry( "Shuffle" ); |
63 | usePlaylist = cfg.readBoolEntry( "UsePlayList" ); | 63 | usePlaylist = cfg.readBoolEntry( "UsePlayList" ); |
64 | usePlaylist = TRUE; | 64 | usePlaylist = TRUE; |
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index 4b1ff22..218fd49 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -280,37 +280,37 @@ populateVideoView(); | |||
280 | 280 | ||
281 | connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); | 281 | connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); |
282 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); | 282 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); |
283 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); | 283 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); |
284 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); | 284 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); |
285 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); | 285 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); |
286 | 286 | ||
287 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); | 287 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); |
288 | // connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) ); | 288 | // connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) ); |
289 | 289 | ||
290 | setCentralWidget( vbox5 ); | 290 | setCentralWidget( vbox5 ); |
291 | 291 | ||
292 | Config cfg( "MediaPlayer" ); | 292 | Config cfg( "OpiePlayer" ); |
293 | readConfig( cfg ); | 293 | readConfig( cfg ); |
294 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); | 294 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); |
295 | // qDebug("currentList is "+currentPlaylist); | 295 | // qDebug("currentList is "+currentPlaylist); |
296 | loadList(DocLnk( currentPlaylist)); | 296 | loadList(DocLnk( currentPlaylist)); |
297 | setCaption(tr("OpiePlayer: ")+ currentPlaylist ); | 297 | setCaption(tr("OpiePlayer: ")+ currentPlaylist ); |
298 | 298 | ||
299 | initializeStates(); | 299 | initializeStates(); |
300 | } | 300 | } |
301 | 301 | ||
302 | 302 | ||
303 | PlayListWidget::~PlayListWidget() { | 303 | PlayListWidget::~PlayListWidget() { |
304 | Config cfg( "MediaPlayer" ); | 304 | Config cfg( "OpiePlayer" ); |
305 | writeConfig( cfg ); | 305 | writeConfig( cfg ); |
306 | 306 | ||
307 | 307 | ||
308 | if ( d->current ) | 308 | if ( d->current ) |
309 | delete d->current; | 309 | delete d->current; |
310 | delete d; | 310 | delete d; |
311 | } | 311 | } |
312 | 312 | ||
313 | 313 | ||
314 | void PlayListWidget::initializeStates() { | 314 | void PlayListWidget::initializeStates() { |
315 | 315 | ||
316 | d->tbPlay->setOn( mediaPlayerState->playing() ); | 316 | d->tbPlay->setOn( mediaPlayerState->playing() ); |
@@ -616,68 +616,68 @@ void PlayListWidget::saveList() { | |||
616 | // } | 616 | // } |
617 | // qDebug("new doclnk"); | 617 | // qDebug("new doclnk"); |
618 | DocLnk lnk; | 618 | DocLnk lnk; |
619 | // lnk.setComment( ""); | 619 | // lnk.setComment( ""); |
620 | lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property | 620 | lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property |
621 | lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D | 621 | lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D |
622 | lnk.setIcon("mpegplayer/playlist2"); | 622 | lnk.setIcon("mpegplayer/playlist2"); |
623 | lnk.setName( filename); //sets file name | 623 | lnk.setName( filename); //sets file name |
624 | // qDebug(filename); | 624 | // qDebug(filename); |
625 | if(!lnk.writeLink()) | 625 | if(!lnk.writeLink()) |
626 | qDebug("Writing doclink did not work"); | 626 | qDebug("Writing doclink did not work"); |
627 | } | 627 | } |
628 | Config config( "MediaPlayer" ); | 628 | Config config( "OpiePlayer" ); |
629 | config.writeEntry("CurrentPlaylist",filename); | 629 | config.writeEntry("CurrentPlaylist",filename); |
630 | setCaption(tr("OpiePlayer: ")+filename); | 630 | setCaption(tr("OpiePlayer: ")+filename); |
631 | d->selectedFiles->first(); | 631 | d->selectedFiles->first(); |
632 | if(fileDlg) | 632 | if(fileDlg) |
633 | delete fileDlg; | 633 | delete fileDlg; |
634 | } | 634 | } |
635 | 635 | ||
636 | void PlayListWidget::loadList( const DocLnk & lnk) { | 636 | void PlayListWidget::loadList( const DocLnk & lnk) { |
637 | QString name= lnk.name(); | 637 | QString name= lnk.name(); |
638 | // qDebug("currentList is "+name); | 638 | // qDebug("currentList is "+name); |
639 | if( name.length()>1) { | 639 | if( name.length()>1) { |
640 | setCaption("OpiePlayer: "+name); | 640 | setCaption("OpiePlayer: "+name); |
641 | // qDebug("load list "+ name+".playlist"); | 641 | // qDebug("load list "+ name+".playlist"); |
642 | clearList(); | 642 | clearList(); |
643 | Config cfg( name+".playlist"); | 643 | Config cfg( name+".playlist"); |
644 | readConfig(cfg); | 644 | readConfig(cfg); |
645 | 645 | ||
646 | tabWidget->setCurrentPage(0); | 646 | tabWidget->setCurrentPage(0); |
647 | 647 | ||
648 | Config config( "MediaPlayer" ); | 648 | Config config( "OpiePlayer" ); |
649 | config.writeEntry("CurrentPlaylist", name); | 649 | config.writeEntry("CurrentPlaylist", name); |
650 | // d->selectedFiles->first(); | 650 | // d->selectedFiles->first(); |
651 | } | 651 | } |
652 | 652 | ||
653 | } | 653 | } |
654 | 654 | ||
655 | void PlayListWidget::setPlaylist( bool shown ) { | 655 | void PlayListWidget::setPlaylist( bool shown ) { |
656 | if ( shown ) | 656 | if ( shown ) |
657 | d->playListFrame->show(); | 657 | d->playListFrame->show(); |
658 | else | 658 | else |
659 | d->playListFrame->hide(); | 659 | d->playListFrame->hide(); |
660 | } | 660 | } |
661 | 661 | ||
662 | void PlayListWidget::setView( char view ) { | 662 | void PlayListWidget::setView( char view ) { |
663 | if ( view == 'l' ) | 663 | if ( view == 'l' ) |
664 | showMaximized(); | 664 | showMaximized(); |
665 | else | 665 | else |
666 | hide(); | 666 | hide(); |
667 | } | 667 | } |
668 | 668 | ||
669 | void PlayListWidget::addSelected() { | 669 | void PlayListWidget::addSelected() { |
670 | 670 | ||
671 | Config cfg( "MediaPlayer" ); | 671 | Config cfg( "OpiePlayer" ); |
672 | cfg.setGroup("PlayList"); | 672 | cfg.setGroup("PlayList"); |
673 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); | 673 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); |
674 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); | 674 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); |
675 | 675 | ||
676 | switch (tabWidget->currentPageIndex()) { | 676 | switch (tabWidget->currentPageIndex()) { |
677 | case 0: //playlist | 677 | case 0: //playlist |
678 | break; | 678 | break; |
679 | case 1: { //audio | 679 | case 1: { //audio |
680 | for ( int i = 0; i < noOfFiles; i++ ) { | 680 | for ( int i = 0; i < noOfFiles; i++ ) { |
681 | QString entryName; | 681 | QString entryName; |
682 | entryName.sprintf( "File%i", i + 1 ); | 682 | entryName.sprintf( "File%i", i + 1 ); |
683 | QString linkFile = cfg.readEntry( entryName ); | 683 | QString linkFile = cfg.readEntry( entryName ); |
@@ -870,25 +870,25 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const | |||
870 | QPopupMenu m; | 870 | QPopupMenu m; |
871 | m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); | 871 | m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); |
872 | m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); | 872 | m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); |
873 | // m.insertSeparator(); | 873 | // m.insertSeparator(); |
874 | m.exec( QCursor::pos() ); | 874 | m.exec( QCursor::pos() ); |
875 | } | 875 | } |
876 | break; | 876 | break; |
877 | }; | 877 | }; |
878 | 878 | ||
879 | } | 879 | } |
880 | 880 | ||
881 | void PlayListWidget::listDelete() { | 881 | void PlayListWidget::listDelete() { |
882 | Config cfg( "MediaPlayer" ); | 882 | Config cfg( "OpiePlayer" ); |
883 | cfg.setGroup("PlayList"); | 883 | cfg.setGroup("PlayList"); |
884 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); | 884 | QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); |
885 | QString file; | 885 | QString file; |
886 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); | 886 | int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); |
887 | switch ( tabWidget->currentPageIndex()) { | 887 | switch ( tabWidget->currentPageIndex()) { |
888 | case 0: | 888 | case 0: |
889 | break; | 889 | break; |
890 | case 1: | 890 | case 1: |
891 | { | 891 | { |
892 | file = audioView->selectedItem()->text(0); | 892 | file = audioView->selectedItem()->text(0); |
893 | // Global::findDocuments(&files, "audio/*"); | 893 | // Global::findDocuments(&files, "audio/*"); |
894 | // AppLnkSet appFiles; | 894 | // AppLnkSet appFiles; |