summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediaplayer.cpp1
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp11
2 files changed, 8 insertions, 4 deletions
diff --git a/noncore/multimedia/opieplayer2/mediaplayer.cpp b/noncore/multimedia/opieplayer2/mediaplayer.cpp
index 603d426..bf2acc8 100644
--- a/noncore/multimedia/opieplayer2/mediaplayer.cpp
+++ b/noncore/multimedia/opieplayer2/mediaplayer.cpp
@@ -182,8 +182,9 @@ void MediaPlayer::timerEvent( QTimerEvent * ) {
182 } 182 }
183 183
184 184
185 // TODO FIXME 185 // TODO FIXME
186 // huh??
186 unsigned int v= 0; 187 unsigned int v= 0;
187 v = volControl->volume(); 188 v = volControl->volume();
188 v = v / 10; 189 v = v / 10;
189 190
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
@@ -124,17 +124,18 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
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
133PlayListWidget::~PlayListWidget() { 135PlayListWidget::~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;
@@ -783,9 +784,9 @@ void PlayListWidget::openFile() {
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() );
@@ -928,8 +929,10 @@ void PlayListWidget::writem3u() {
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() );