-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index ab6b593..26c2896 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -124,225 +124,225 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) | |||
124 | connect( audioView, SIGNAL( returnPressed( QListViewItem *) ), | 124 | connect( audioView, SIGNAL( returnPressed( QListViewItem *) ), |
125 | this,SLOT( playIt( QListViewItem *) ) ); | 125 | this,SLOT( playIt( QListViewItem *) ) ); |
126 | connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), | 126 | connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), |
127 | this, SLOT( addToSelection( QListViewItem *) ) ); | 127 | this, SLOT( addToSelection( QListViewItem *) ) ); |
128 | connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ), | 128 | connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ), |
129 | this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) ); | 129 | this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) ); |
130 | connect( videoView, SIGNAL( returnPressed( QListViewItem *) ), | 130 | connect( videoView, SIGNAL( returnPressed( QListViewItem *) ), |
131 | this,SLOT( playIt( QListViewItem *) ) ); | 131 | this,SLOT( playIt( QListViewItem *) ) ); |
132 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), | 132 | connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), |
133 | this, SLOT( addToSelection( QListViewItem *) ) ); | 133 | this, SLOT( addToSelection( QListViewItem *) ) ); |
134 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), | 134 | connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), |
135 | this, SLOT( loadList( const DocLnk & ) ) ); | 135 | this, SLOT( loadList( const DocLnk & ) ) ); |
136 | connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ), | 136 | connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ), |
137 | this, SLOT( tabChanged( QWidget* ) ) ); | 137 | this, SLOT( tabChanged( QWidget* ) ) ); |
138 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), | 138 | connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), |
139 | d->tbPlay, SLOT( setOn( bool ) ) ); | 139 | d->tbPlay, SLOT( setOn( bool ) ) ); |
140 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), | 140 | connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), |
141 | d->tbLoop, SLOT( setOn( bool ) ) ); | 141 | d->tbLoop, SLOT( setOn( bool ) ) ); |
142 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), | 142 | connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), |
143 | d->tbShuffle, SLOT( setOn( bool ) ) ); | 143 | d->tbShuffle, SLOT( setOn( bool ) ) ); |
144 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), | 144 | connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), |
145 | this, SLOT( setPlaylist( bool ) ) ); | 145 | this, SLOT( setPlaylist( bool ) ) ); |
146 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), | 146 | connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), |
147 | this, SLOT( playIt( QListViewItem *) ) ); | 147 | this, SLOT( playIt( QListViewItem *) ) ); |
148 | connect ( gammaSlider, SIGNAL( valueChanged( int ) ), | 148 | connect ( gammaSlider, SIGNAL( valueChanged( int ) ), |
149 | mediaPlayerState, SLOT( setVideoGamma( int ) ) ); | 149 | mediaPlayerState, SLOT( setVideoGamma( int ) ) ); |
150 | 150 | ||
151 | // cfg.setGroup( "PlayList" ); | 151 | // cfg.setGroup( "PlayList" ); |
152 | // if( cfg.readBoolEntry("newPlaylist") ){ | 152 | // if( cfg.readBoolEntry("newPlaylist") ){ |
153 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "" ); | 153 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "" ); |
154 | loadList(DocLnk( currentPlaylist ) ); | 154 | loadList(DocLnk( currentPlaylist ) ); |
155 | setCaption( tr( "OpiePlayer: " ) + currentPlaylist ); | 155 | setCaption( tr( "OpiePlayer: " ) + currentPlaylist ); |
156 | // } else { | 156 | // } else { |
157 | // readConfig( cfg ); | 157 | // readConfig( cfg ); |
158 | 158 | ||
159 | // } | 159 | // } |
160 | // see which skins are installed | 160 | // see which skins are installed |
161 | videoScan=FALSE; | 161 | videoScan=FALSE; |
162 | audioScan=FALSE; | 162 | audioScan=FALSE; |
163 | populateSkinsMenu(); | 163 | populateSkinsMenu(); |
164 | initializeStates(); | 164 | initializeStates(); |
165 | } | 165 | } |
166 | 166 | ||
167 | 167 | ||
168 | PlayListWidget::~PlayListWidget() { | 168 | PlayListWidget::~PlayListWidget() { |
169 | // WTF?!@?! | 169 | // WTF?!@?! |
170 | 170 | ||
171 | if ( d->current ) { | 171 | if ( d->current ) { |
172 | delete d->current; | 172 | delete d->current; |
173 | } | 173 | } |
174 | delete d; | 174 | delete d; |
175 | } | 175 | } |
176 | 176 | ||
177 | 177 | ||
178 | void PlayListWidget::initializeStates() { | 178 | void PlayListWidget::initializeStates() { |
179 | d->tbPlay->setOn( mediaPlayerState->playing() ); | 179 | d->tbPlay->setOn( mediaPlayerState->playing() ); |
180 | d->tbLoop->setOn( mediaPlayerState->looping() ); | 180 | d->tbLoop->setOn( mediaPlayerState->looping() ); |
181 | d->tbShuffle->setOn( mediaPlayerState->shuffled() ); | 181 | d->tbShuffle->setOn( mediaPlayerState->shuffled() ); |
182 | setPlaylist( true ); | 182 | setPlaylist( true ); |
183 | } | 183 | } |
184 | 184 | ||
185 | 185 | ||
186 | void PlayListWidget::readConfig( Config& cfg ) { | 186 | void PlayListWidget::readConfig( Config& cfg ) { |
187 | 187 | ||
188 | cfg.setGroup( "PlayList" ); | 188 | cfg.setGroup( "PlayList" ); |
189 | QString currentString = cfg.readEntry( "current", "" ); | 189 | QString currentString = cfg.readEntry( "current", "" ); |
190 | int noOfFiles = cfg.readNumEntry( "NumberOfFiles", 0 ); | 190 | int noOfFiles = cfg.readNumEntry( "NumberOfFiles", 0 ); |
191 | 191 | ||
192 | for ( int i = 0; i < noOfFiles; i++ ) { | 192 | for ( int i = 0; i < noOfFiles; i++ ) { |
193 | QString entryName; | 193 | QString entryName; |
194 | entryName.sprintf( "File%i", i + 1 ); | 194 | entryName.sprintf( "File%i", i + 1 ); |
195 | 195 | ||
196 | QString linkFile = cfg.readEntry( entryName ); | 196 | QString linkFile = cfg.readEntry( entryName ); |
197 | 197 | ||
198 | qDebug("reading "+linkFile); | 198 | qDebug("reading "+linkFile); |
199 | 199 | ||
200 | if( QFileInfo( linkFile ).exists() ) { | 200 | if( QFileInfo( linkFile ).exists() ) { |
201 | 201 | ||
202 | DocLnk lnk( linkFile ); | 202 | DocLnk lnk( linkFile ); |
203 | 203 | ||
204 | if ( QFileInfo( lnk.file() ).exists() || | 204 | if ( QFileInfo( lnk.file() ).exists() || |
205 | 205 | ||
206 | linkFile.find( "http" , 0, TRUE) != -1) { | 206 | linkFile.find( "http" , 0, TRUE) != -1) { |
207 | 207 | ||
208 | d->selectedFiles->addToSelection( lnk ); | 208 | d->selectedFiles->addToSelection( lnk ); |
209 | 209 | ||
210 | } | 210 | } |
211 | } | 211 | } |
212 | } | 212 | } |
213 | d->selectedFiles->setSelectedItem( currentString ); | 213 | d->selectedFiles->setSelectedItem( currentString ); |
214 | 214 | ||
215 | } | 215 | } |
216 | 216 | ||
217 | 217 | ||
218 | void PlayListWidget::writeConfig( Config& cfg ) const { | 218 | void PlayListWidget::writeConfig( Config& cfg ) const { |
219 | 219 | ||
220 | // Config config( "OpiePlayer" ); | 220 | Config config( "OpiePlayer" ); |
221 | // config.setGroup( "PlayList" ); | 221 | config.setGroup( "PlayList" ); |
222 | 222 | ||
223 | // if(config.readBoolEntry("newPlaylist")) { | 223 | // if(config.readBoolEntry("newPlaylist")) { |
224 | // new for testing | 224 | // new for testing |
225 | QString name, filename, list; | 225 | QString name, filename, list; |
226 | Om3u *m3uList; | 226 | Om3u *m3uList; |
227 | name = "default"; | 227 | name = "default"; |
228 | 228 | ||
229 | filename=QPEApplication::documentDir() + "/" + name+".m3u"; | 229 | filename=QPEApplication::documentDir() + "/" + name+".m3u"; |
230 | 230 | ||
231 | m3uList = new Om3u(filename); | 231 | m3uList = new Om3u(filename); |
232 | 232 | ||
233 | d->selectedFiles->first(); | 233 | d->selectedFiles->first(); |
234 | do { | 234 | do { |
235 | m3uList->add( d->selectedFiles->current()->file()); | 235 | m3uList->add( d->selectedFiles->current()->file()); |
236 | } | 236 | } |
237 | while ( d->selectedFiles->next() ); | 237 | while ( d->selectedFiles->next() ); |
238 | 238 | ||
239 | qDebug( list ); | 239 | qDebug( list ); |
240 | 240 | ||
241 | m3uList->write(); | 241 | m3uList->write(); |
242 | m3uList->close(); | 242 | m3uList->close(); |
243 | if(m3uList) delete m3uList; | 243 | if(m3uList) delete m3uList; |
244 | 244 | ||
245 | DocLnk lnk; | 245 | DocLnk lnk; |
246 | lnk.setFile( filename); | 246 | lnk.setFile( filename); |
247 | lnk.setIcon("opieplayer2/playlist2"); | 247 | lnk.setIcon("opieplayer2/playlist2"); |
248 | lnk.setName( name); //sets file name | 248 | lnk.setName( name); //sets file name |
249 | 249 | ||
250 | qDebug("writing default playlist "+filename); | 250 | qDebug("writing default playlist "+filename); |
251 | 251 | ||
252 | config.writeEntry("CurrentPlaylist", filename); | 252 | config.writeEntry("CurrentPlaylist", filename); |
253 | // currentPlayList=filename; | 253 | // currentPlayList=filename; |
254 | 254 | ||
255 | if(!lnk.writeLink()) { | 255 | if(!lnk.writeLink()) { |
256 | qDebug("Writing doclink did not work"); | 256 | qDebug("Writing doclink did not work"); |
257 | } | 257 | } |
258 | 258 | ||
259 | // } else { | 259 | // } else { |
260 | 260 | ||
261 | // d->selectedFiles->writeCurrent( cfg ); | 261 | // d->selectedFiles->writeCurrent( cfg ); |
262 | // int noOfFiles = 0; | 262 | // int noOfFiles = 0; |
263 | // d->selectedFiles->first(); | 263 | // d->selectedFiles->first(); |
264 | 264 | ||
265 | // do { | 265 | // do { |
266 | // const DocLnk *lnk = d->selectedFiles->current(); | 266 | // const DocLnk *lnk = d->selectedFiles->current(); |
267 | 267 | ||
268 | // if ( lnk ) { | 268 | // if ( lnk ) { |
269 | 269 | ||
270 | // QString entryName; | 270 | // QString entryName; |
271 | // entryName.sprintf( "File%i", noOfFiles + 1 ); | 271 | // entryName.sprintf( "File%i", noOfFiles + 1 ); |
272 | 272 | ||
273 | // cfg.writeEntry( entryName, lnk->linkFile() ); | 273 | // cfg.writeEntry( entryName, lnk->linkFile() ); |
274 | // // if this link does exist, add it so we have the file | 274 | // // if this link does exist, add it so we have the file |
275 | // // next time... | 275 | // // next time... |
276 | 276 | ||
277 | // if ( !QFile::exists( lnk->linkFile() ) ) { | 277 | // if ( !QFile::exists( lnk->linkFile() ) ) { |
278 | // lnk->writeLink(); | 278 | // lnk->writeLink(); |
279 | // } | 279 | // } |
280 | // } | 280 | // } |
281 | // noOfFiles++; | 281 | // noOfFiles++; |
282 | // } | 282 | // } |
283 | // while ( d->selectedFiles->next() ); | 283 | // while ( d->selectedFiles->next() ); |
284 | // cfg.writeEntry("NumberOfFiles", noOfFiles ); | 284 | // cfg.writeEntry("NumberOfFiles", noOfFiles ); |
285 | // } | 285 | // } |
286 | } | 286 | } |
287 | 287 | ||
288 | 288 | ||
289 | void PlayListWidget::addToSelection( const DocLnk& lnk ) { | 289 | void PlayListWidget::addToSelection( const DocLnk& lnk ) { |
290 | d->setDocumentUsed = FALSE; | 290 | d->setDocumentUsed = FALSE; |
291 | if ( mediaPlayerState->playlist() ) { | 291 | if ( mediaPlayerState->playlist() ) { |
292 | if( QFileInfo( lnk.file() ).exists() || | 292 | if( QFileInfo( lnk.file() ).exists() || |
293 | lnk.file().left(4) == "http" ) | 293 | lnk.file().left(4) == "http" ) |
294 | d->selectedFiles->addToSelection( lnk ); | 294 | d->selectedFiles->addToSelection( lnk ); |
295 | } | 295 | } |
296 | else | 296 | else |
297 | mediaPlayerState->setPlaying( TRUE ); | 297 | mediaPlayerState->setPlaying( TRUE ); |
298 | } | 298 | } |
299 | 299 | ||
300 | 300 | ||
301 | void PlayListWidget::clearList() { | 301 | void PlayListWidget::clearList() { |
302 | while ( first() ) { | 302 | while ( first() ) { |
303 | d->selectedFiles->removeSelected(); | 303 | d->selectedFiles->removeSelected(); |
304 | } | 304 | } |
305 | } | 305 | } |
306 | 306 | ||
307 | 307 | ||
308 | void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , int) { | 308 | void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , int) { |
309 | switch (mouse) { | 309 | switch (mouse) { |
310 | case 1: | 310 | case 1: |
311 | break; | 311 | break; |
312 | case 2: | 312 | case 2: |
313 | { | 313 | { |
314 | QPopupMenu m; | 314 | QPopupMenu m; |
315 | m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); | 315 | m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); |
316 | m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); | 316 | m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); |
317 | m.exec( QCursor::pos() ); | 317 | m.exec( QCursor::pos() ); |
318 | } | 318 | } |
319 | break; | 319 | break; |
320 | } | 320 | } |
321 | } | 321 | } |
322 | 322 | ||
323 | 323 | ||
324 | void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint& , int ) { | 324 | void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint& , int ) { |
325 | switch (mouse) { | 325 | switch (mouse) { |
326 | case 1: | 326 | case 1: |
327 | break; | 327 | break; |
328 | case 2: | 328 | case 2: |
329 | { | 329 | { |
330 | QPopupMenu m; | 330 | QPopupMenu m; |
331 | m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); | 331 | m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); |
332 | m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); | 332 | m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); |
333 | m.exec( QCursor::pos() ); | 333 | m.exec( QCursor::pos() ); |
334 | } | 334 | } |
335 | break; | 335 | break; |
336 | } | 336 | } |
337 | } | 337 | } |
338 | 338 | ||
339 | 339 | ||
340 | void PlayListWidget::addAllToList() { | 340 | void PlayListWidget::addAllToList() { |
341 | DocLnkSet filesAll; | 341 | DocLnkSet filesAll; |
342 | Global::findDocuments(&filesAll, "video/*;audio/*"); | 342 | Global::findDocuments(&filesAll, "video/*;audio/*"); |
343 | QListIterator<DocLnk> Adit( filesAll.children() ); | 343 | QListIterator<DocLnk> Adit( filesAll.children() ); |
344 | for ( ; Adit.current(); ++Adit ) { | 344 | for ( ; Adit.current(); ++Adit ) { |
345 | if( QFileInfo( Adit.current()->file() ).exists() ) { | 345 | if( QFileInfo( Adit.current()->file() ).exists() ) { |
346 | d->selectedFiles->addToSelection( **Adit ); | 346 | d->selectedFiles->addToSelection( **Adit ); |
347 | } | 347 | } |
348 | } | 348 | } |