summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--core/multimedia/opieplayer/mediaplayerstate.cpp4
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp12
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
@@ -41,16 +41,16 @@
41 41
42 42
43MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) 43MediaPlayerState::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
51MediaPlayerState::~MediaPlayerState() { 51MediaPlayerState::~MediaPlayerState() {
52 Config cfg( "MediaPlayer" ); 52 Config cfg( "OpiePlayer" );
53 writeConfig( cfg ); 53 writeConfig( cfg );
54} 54}
55 55
56 56
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
@@ -288,9 +288,9 @@ populateVideoView();
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));
@@ -300,9 +300,9 @@ populateVideoView();
300} 300}
301 301
302 302
303PlayListWidget::~PlayListWidget() { 303PlayListWidget::~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 )
@@ -624,9 +624,9 @@ void PlayListWidget::saveList() {
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)
@@ -644,9 +644,9 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
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
@@ -667,9 +667,9 @@ void PlayListWidget::setView( char view ) {
667} 667}
668 668
669void PlayListWidget::addSelected() { 669void 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
@@ -878,9 +878,9 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const
878 878
879} 879}
880 880
881void PlayListWidget::listDelete() { 881void 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 );