Diffstat (limited to 'noncore/multimedia/opieplayer2/playlistwidget.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 6c7f6ba..603a7a3 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -122,21 +122,22 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
122 | readConfig( cfg ); | 122 | readConfig( cfg ); |
123 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "" ); | 123 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "" ); |
124 | loadList(DocLnk( currentPlaylist ) ); | 124 | loadList(DocLnk( currentPlaylist ) ); |
125 | setCaption( tr( "OpiePlayer: " ) + currentPlaylist ); | 125 | setCaption( tr( "OpiePlayer: " ) + currentPlaylist ); |
126 | 126 | ||
127 | // see which skins are installed | 127 | // see which skins are installed |
128 | videoScan=FALSE; | ||
129 | audioScan=FALSE; | ||
128 | populateSkinsMenu(); | 130 | populateSkinsMenu(); |
129 | initializeStates(); | 131 | initializeStates(); |
130 | } | 132 | } |
131 | 133 | ||
132 | 134 | ||
133 | PlayListWidget::~PlayListWidget() { | 135 | PlayListWidget::~PlayListWidget() { |
134 | /* fixing symptoms and not sources is entirely stupid - zecke */ | 136 | // WTF?!@?! |
135 | // Config cfg( "OpiePlayer" ); | 137 | |
136 | // writeConfig( cfg ); | ||
137 | if ( d->current ) { | 138 | if ( d->current ) { |
138 | delete d->current; | 139 | delete d->current; |
139 | } | 140 | } |
140 | delete d; | 141 | delete d; |
141 | } | 142 | } |
142 | 143 | ||
@@ -781,13 +782,13 @@ void PlayListWidget::openFile() { | |||
781 | qDebug( "Selected filename is " + filename ); | 782 | qDebug( "Selected filename is " + filename ); |
782 | if( filename.right( 3 ) == "m3u" ) { | 783 | if( filename.right( 3 ) == "m3u" ) { |
783 | readm3u( filename ); | 784 | readm3u( filename ); |
784 | } else if( filename.right(3) == "pls" ) { | 785 | } else if( filename.right(3) == "pls" ) { |
785 | readPls( filename ); | 786 | readPls( filename ); |
786 | } else { | 787 | } else { |
787 | /* FIXME ....... AUDIO/X-MPEGURL is bad*/ | 788 | // this doesnt need fixing |
788 | DocLnk lnk; | 789 | DocLnk lnk; |
789 | lnk.setName( filename ); //sets file name | 790 | lnk.setName( filename ); //sets file name |
790 | lnk.setFile( filename ); //sets File property | 791 | lnk.setFile( filename ); //sets File property |
791 | //qWarning( "Mimetype: " + MimeType( QFile::encodeName(filename) ).id() ); | 792 | //qWarning( "Mimetype: " + MimeType( QFile::encodeName(filename) ).id() ); |
792 | lnk.setType( MimeType( QFile::encodeName(filename) ).id() ); | 793 | lnk.setType( MimeType( QFile::encodeName(filename) ).id() ); |
793 | lnk.setExec( "opieplayer" ); | 794 | lnk.setExec( "opieplayer" ); |
@@ -926,12 +927,14 @@ void PlayListWidget::writem3u() { | |||
926 | d->selectedFiles->first(); | 927 | d->selectedFiles->first(); |
927 | do { | 928 | do { |
928 | // we dont check for existance because of url's | 929 | // we dont check for existance because of url's |
929 | // qDebug(d->selectedFiles->current()->file()); | 930 | // qDebug(d->selectedFiles->current()->file()); |
930 | 931 | ||
931 | // so maybe we should do some net checking to ,-) | 932 | // so maybe we should do some net checking to ,-) |
933 | // no, cause it takes to long... | ||
934 | |||
932 | list += d->selectedFiles->current()->file() + "\n"; | 935 | list += d->selectedFiles->current()->file() + "\n"; |
933 | noOfFiles++; | 936 | noOfFiles++; |
934 | } | 937 | } |
935 | while ( d->selectedFiles->next() ); | 938 | while ( d->selectedFiles->next() ); |
936 | qDebug( list ); | 939 | qDebug( list ); |
937 | if( filename.left( 1) != "/" ) { | 940 | if( filename.left( 1) != "/" ) { |