summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistfileview.cpp2
-rw-r--r--noncore/multimedia/opieplayer2/playlistfileview.h4
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp18
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.h2
4 files changed, 14 insertions, 12 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.cpp b/noncore/multimedia/opieplayer2/playlistfileview.cpp
index 2726296..1e2ef89 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.cpp
+++ b/noncore/multimedia/opieplayer2/playlistfileview.cpp
@@ -1,31 +1,31 @@
1 1
2#include "playlistfileview.h" 2#include "playlistfileview.h"
3 3
4#include <qpe/global.h> 4#include <qpe/global.h>
5 5
6PlayListFileView::PlayListFileView( const QString &mimeTypePattern, QWidget *parent, const char *name ) 6PlayListFileView::PlayListFileView( const QString &mimeTypePattern, QWidget *parent, const char *name )
7 : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern ) 7 : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern ), m_scannedFiles( false )
8{ 8{
9 addColumn( tr( "Title" ), 140); 9 addColumn( tr( "Title" ), 140);
10 addColumn( tr( "Size" ), -1 ); 10 addColumn( tr( "Size" ), -1 );
11 addColumn(tr( "Media" ), 0 ); 11 addColumn(tr( "Media" ), 0 );
12 addColumn(tr( "Path" ), -1 ); 12 addColumn(tr( "Path" ), -1 );
13 setColumnAlignment( 1, Qt::AlignRight ); 13 setColumnAlignment( 1, Qt::AlignRight );
14 setColumnAlignment( 2, Qt::AlignRight ); 14 setColumnAlignment( 2, Qt::AlignRight );
15 setAllColumnsShowFocus( TRUE ); 15 setAllColumnsShowFocus( TRUE );
16 setSorting( 3, TRUE ); 16 setSorting( 3, TRUE );
17 setMultiSelection( TRUE ); 17 setMultiSelection( TRUE );
18 setSelectionMode( QListView::Extended ); 18 setSelectionMode( QListView::Extended );
19} 19}
20 20
21PlayListFileView::~PlayListFileView() 21PlayListFileView::~PlayListFileView()
22{ 22{
23} 23}
24 24
25void PlayListFileView::scanFiles() 25void PlayListFileView::scanFiles()
26{ 26{
27 m_files.detachChildren(); 27 m_files.detachChildren();
28 QListIterator<DocLnk> sdit( m_files.children() ); 28 QListIterator<DocLnk> sdit( m_files.children() );
29 for ( ; sdit.current(); ++sdit ) 29 for ( ; sdit.current(); ++sdit )
30 delete sdit.current(); 30 delete sdit.current();
31 31
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.h b/noncore/multimedia/opieplayer2/playlistfileview.h
index 08db929..4e17966 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.h
+++ b/noncore/multimedia/opieplayer2/playlistfileview.h
@@ -1,27 +1,31 @@
1#ifndef PLAYLISTFILEVIEW_H 1#ifndef PLAYLISTFILEVIEW_H
2#define PLAYLISTFILEVIEW_H 2#define PLAYLISTFILEVIEW_H
3 3
4#include "playlistview.h" 4#include "playlistview.h"
5 5
6#include <qpe/applnk.h> 6#include <qpe/applnk.h>
7 7
8class PlayListFileView : public PlayListView 8class PlayListFileView : public PlayListView
9{ 9{
10 Q_OBJECT 10 Q_OBJECT
11public: 11public:
12 PlayListFileView( const QString &mimeTypePattern, QWidget *parent, const char *name = 0 ); 12 PlayListFileView( const QString &mimeTypePattern, QWidget *parent, const char *name = 0 );
13 virtual ~PlayListFileView(); 13 virtual ~PlayListFileView();
14 14
15 // both temporarily accessible that way until the caller code has
16 // been migrated into this class
15 DocLnkSet &files() { return m_files; } 17 DocLnkSet &files() { return m_files; }
18 bool &scannedFiles() { return m_scannedFiles; }
16 19
17public slots: 20public slots:
18 void scanFiles(); 21 void scanFiles();
19 22
20private: 23private:
21 QString m_mimeTypePattern; 24 QString m_mimeTypePattern;
22 DocLnkSet m_files; 25 DocLnkSet m_files;
26 bool m_scannedFiles;
23}; 27};
24 28
25#endif // PLAYLISTFILEVIEW_H 29#endif // PLAYLISTFILEVIEW_H
26/* vim: et sw=4 ts=4 30/* vim: et sw=4 ts=4
27 */ 31 */
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 93e7919..12b8a71 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -130,50 +130,48 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
130 connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), 130 connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ),
131 this, SLOT( addToSelection( QListViewItem *) ) ); 131 this, SLOT( addToSelection( QListViewItem *) ) );
132 connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ), 132 connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int) ),
133 this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) ); 133 this,SLOT( viewPressed( int, QListViewItem *, const QPoint&, int) ) );
134 connect( videoView, SIGNAL( returnPressed( QListViewItem *) ), 134 connect( videoView, SIGNAL( returnPressed( QListViewItem *) ),
135 this,SLOT( playIt( QListViewItem *) ) ); 135 this,SLOT( playIt( QListViewItem *) ) );
136 connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), 136 connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ),
137 this, SLOT( addToSelection( QListViewItem *) ) ); 137 this, SLOT( addToSelection( QListViewItem *) ) );
138 connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), 138 connect( playLists, SIGNAL( fileSelected( const DocLnk &) ),
139 this, SLOT( loadList( const DocLnk & ) ) ); 139 this, SLOT( loadList( const DocLnk & ) ) );
140 connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ), 140 connect( tabWidget, SIGNAL ( currentChanged(QWidget*) ),
141 this, SLOT( tabChanged( QWidget* ) ) ); 141 this, SLOT( tabChanged( QWidget* ) ) );
142 connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ), 142 connect( &mediaPlayerState, SIGNAL( playingToggled( bool ) ),
143 d->tbPlay, SLOT( setOn( bool ) ) ); 143 d->tbPlay, SLOT( setOn( bool ) ) );
144 connect( &mediaPlayerState, SIGNAL( loopingToggled( bool ) ), 144 connect( &mediaPlayerState, SIGNAL( loopingToggled( bool ) ),
145 d->tbLoop, SLOT( setOn( bool ) ) ); 145 d->tbLoop, SLOT( setOn( bool ) ) );
146 connect( &mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), 146 connect( &mediaPlayerState, SIGNAL( shuffledToggled( bool ) ),
147 d->tbShuffle, SLOT( setOn( bool ) ) ); 147 d->tbShuffle, SLOT( setOn( bool ) ) );
148 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), 148 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ),
149 this, SLOT( playIt( QListViewItem *) ) ); 149 this, SLOT( playIt( QListViewItem *) ) );
150 connect ( gammaSlider, SIGNAL( valueChanged( int ) ), 150 connect ( gammaSlider, SIGNAL( valueChanged( int ) ),
151 &mediaPlayerState, SLOT( setVideoGamma( int ) ) ); 151 &mediaPlayerState, SLOT( setVideoGamma( int ) ) );
152 152
153 // see which skins are installed 153 // see which skins are installed
154 videoScan=false;
155 audioScan=false;
156 audioPopulated=false; 154 audioPopulated=false;
157 videoPopulated=false; 155 videoPopulated=false;
158 populateSkinsMenu(); 156 populateSkinsMenu();
159 initializeStates(); 157 initializeStates();
160 158
161 cfg.setGroup("PlayList"); 159 cfg.setGroup("PlayList");
162 QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); 160 QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default");
163 loadList(DocLnk( currentPlaylist ) ); 161 loadList(DocLnk( currentPlaylist ) );
164} 162}
165 163
166 164
167PlayListWidget::~PlayListWidget() { 165PlayListWidget::~PlayListWidget() {
168 delete d; 166 delete d;
169} 167}
170 168
171 169
172void PlayListWidget::initializeStates() { 170void PlayListWidget::initializeStates() {
173 d->tbPlay->setOn( mediaPlayerState.isPlaying() ); 171 d->tbPlay->setOn( mediaPlayerState.isPlaying() );
174 d->tbLoop->setOn( mediaPlayerState.isLooping() ); 172 d->tbLoop->setOn( mediaPlayerState.isLooping() );
175 d->tbShuffle->setOn( mediaPlayerState.isShuffled() ); 173 d->tbShuffle->setOn( mediaPlayerState.isShuffled() );
176 d->playListFrame->show(); 174 d->playListFrame->show();
177} 175}
178 176
179void PlayListWidget::writeDefaultPlaylist() { 177void PlayListWidget::writeDefaultPlaylist() {
@@ -233,142 +231,142 @@ void PlayListWidget::viewPressed( int mouse, QListViewItem *, const QPoint& , in
233} 231}
234 232
235 233
236void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint& , int ) { 234void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoint& , int ) {
237 switch (mouse) { 235 switch (mouse) {
238 case 1: 236 case 1:
239 break; 237 break;
240 case 2: 238 case 2:
241 { 239 {
242 QPopupMenu m; 240 QPopupMenu m;
243 m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); 241 m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
244 m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); 242 m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
245 m.exec( QCursor::pos() ); 243 m.exec( QCursor::pos() );
246 } 244 }
247 break; 245 break;
248 } 246 }
249} 247}
250 248
251 249
252void PlayListWidget::addAllToList() { 250void PlayListWidget::addAllToList() {
253 251
254// QTime t; 252// QTime t;
255// t.start(); 253// t.start();
256 254
257 if(!audioScan) { 255 if(!audioView->scannedFiles()) {
258 if(audioView->childCount() < 1) 256 if(audioView->childCount() < 1)
259 populateAudioView(); 257 populateAudioView();
260 } 258 }
261 259
262 QListViewItemIterator audioIt( audioView ); 260 QListViewItemIterator audioIt( audioView );
263 DocLnk lnk; 261 DocLnk lnk;
264 QString filename; 262 QString filename;
265 // iterate through all items of the listview 263 // iterate through all items of the listview
266 for ( ; audioIt.current(); ++audioIt ) { 264 for ( ; audioIt.current(); ++audioIt ) {
267 filename = audioIt.current()->text(3); 265 filename = audioIt.current()->text(3);
268 lnk.setName( QFileInfo(filename).baseName() ); //sets name 266 lnk.setName( QFileInfo(filename).baseName() ); //sets name
269 lnk.setFile( filename ); //sets file name 267 lnk.setFile( filename ); //sets file name
270 d->selectedFiles->addToSelection( lnk); 268 d->selectedFiles->addToSelection( lnk);
271 } 269 }
272 270
273 if(!videoScan) { 271 if(!videoView->scannedFiles()) {
274 if(videoView->childCount() < 1) 272 if(videoView->childCount() < 1)
275 populateVideoView(); 273 populateVideoView();
276 } 274 }
277 275
278 QListViewItemIterator videoIt( videoView ); 276 QListViewItemIterator videoIt( videoView );
279 for ( ; videoIt.current(); ++videoIt ) { 277 for ( ; videoIt.current(); ++videoIt ) {
280 filename = videoIt.current()->text(3); 278 filename = videoIt.current()->text(3);
281 lnk.setName( QFileInfo(filename).baseName() ); //sets name 279 lnk.setName( QFileInfo(filename).baseName() ); //sets name
282 lnk.setFile( filename ); //sets file name 280 lnk.setFile( filename ); //sets file name
283 d->selectedFiles->addToSelection( lnk); 281 d->selectedFiles->addToSelection( lnk);
284 } 282 }
285 283
286 // d->selectedFiles->addToSelection( ); 284 // d->selectedFiles->addToSelection( );
287 // if ( it.current()->isSelected() ) 285 // if ( it.current()->isSelected() )
288 // lst->append( audioIt.current() ); 286 // lst->append( audioIt.current() );
289 // } 287 // }
290 288
291 289
292// if(!audioScan) 290// if(!audioScan)
293// scanForAudio(); 291// scanForAudio();
294// if(!videoScan) 292// if(!videoScan)
295// scanForVideo(); 293// scanForVideo();
296 294
297// DocLnkSet filesAll; 295// DocLnkSet filesAll;
298// Global::findDocuments(&filesAll, "video/*;"+audioMimes); 296// Global::findDocuments(&filesAll, "video/*;"+audioMimes);
299// QListIterator<DocLnk> Adit( filesAll.children() ); 297// QListIterator<DocLnk> Adit( filesAll.children() );
300// for ( ; Adit.current(); ++Adit ) { 298// for ( ; Adit.current(); ++Adit ) {
301// if( QFileInfo( Adit.current()->file() ).exists() ) { 299// if( QFileInfo( Adit.current()->file() ).exists() ) {
302// d->selectedFiles->addToSelection( **Adit ); 300// d->selectedFiles->addToSelection( **Adit );
303// } 301// }
304// } 302// }
305 303
306 // qDebug("elapsed time %d", t.elapsed() ); 304 // qDebug("elapsed time %d", t.elapsed() );
307 305
308 tabWidget->setCurrentPage(0); 306 tabWidget->setCurrentPage(0);
309 307
310 writeCurrentM3u(); 308 writeCurrentM3u();
311 d->selectedFiles->first(); 309 d->selectedFiles->first();
312} 310}
313 311
314 312
315void PlayListWidget::addAllMusicToList() { 313void PlayListWidget::addAllMusicToList() {
316 314
317 if(!audioScan) { 315 if(!audioView->scannedFiles()) {
318 if(audioView->childCount() < 1) 316 if(audioView->childCount() < 1)
319 populateAudioView(); 317 populateAudioView();
320 } 318 }
321 319
322 QListViewItemIterator audioIt( audioView ); 320 QListViewItemIterator audioIt( audioView );
323 DocLnk lnk; 321 DocLnk lnk;
324 QString filename; 322 QString filename;
325 // iterate through all items of the listview 323 // iterate through all items of the listview
326 for ( ; audioIt.current(); ++audioIt ) { 324 for ( ; audioIt.current(); ++audioIt ) {
327 filename = audioIt.current()->text(3); 325 filename = audioIt.current()->text(3);
328 lnk.setName( QFileInfo(filename).baseName() ); //sets name 326 lnk.setName( QFileInfo(filename).baseName() ); //sets name
329 lnk.setFile( filename ); //sets file name 327 lnk.setFile( filename ); //sets file name
330 d->selectedFiles->addToSelection( lnk); 328 d->selectedFiles->addToSelection( lnk);
331 } 329 }
332 330
333 /* if(!audioScan) 331 /* if(!audioScan)
334 scanForAudio(); 332 scanForAudio();
335 QListIterator<DocLnk> dit( files.children() ); 333 QListIterator<DocLnk> dit( files.children() );
336 for ( ; dit.current(); ++dit ) { 334 for ( ; dit.current(); ++dit ) {
337 if( QFileInfo(dit.current()->file() ).exists() ) { 335 if( QFileInfo(dit.current()->file() ).exists() ) {
338 d->selectedFiles->addToSelection( **dit ); 336 d->selectedFiles->addToSelection( **dit );
339 } 337 }
340 } 338 }
341 */ 339 */
342 tabWidget->setCurrentPage(0); 340 tabWidget->setCurrentPage(0);
343 writeCurrentM3u(); 341 writeCurrentM3u();
344 d->selectedFiles->first(); 342 d->selectedFiles->first();
345} 343}
346 344
347 345
348void PlayListWidget::addAllVideoToList() { 346void PlayListWidget::addAllVideoToList() {
349 347
350 if(!videoScan) { 348 if(!videoView->scannedFiles()) {
351 if(videoView->childCount() < 1) 349 if(videoView->childCount() < 1)
352 populateVideoView(); 350 populateVideoView();
353 } 351 }
354 352
355 QListViewItemIterator videoIt( videoView ); 353 QListViewItemIterator videoIt( videoView );
356 DocLnk lnk; 354 DocLnk lnk;
357 QString filename; 355 QString filename;
358 for ( ; videoIt.current(); ++videoIt ) { 356 for ( ; videoIt.current(); ++videoIt ) {
359 filename = videoIt.current()->text(3); 357 filename = videoIt.current()->text(3);
360 lnk.setName( QFileInfo(filename).baseName() ); //sets name 358 lnk.setName( QFileInfo(filename).baseName() ); //sets name
361 lnk.setFile( filename ); //sets file name 359 lnk.setFile( filename ); //sets file name
362 d->selectedFiles->addToSelection( lnk); 360 d->selectedFiles->addToSelection( lnk);
363 } 361 }
364 362
365 363
366 /* if(!videoScan) 364 /* if(!videoScan)
367 scanForVideo(); 365 scanForVideo();
368 QListIterator<DocLnk> dit( vFiles.children() ); 366 QListIterator<DocLnk> dit( vFiles.children() );
369 for ( ; dit.current(); ++dit ) { 367 for ( ; dit.current(); ++dit ) {
370 if( QFileInfo( dit.current()->file() ).exists() ) { 368 if( QFileInfo( dit.current()->file() ).exists() ) {
371 d->selectedFiles->addToSelection( **dit ); 369 d->selectedFiles->addToSelection( **dit );
372 } 370 }
373 } 371 }
374*/ 372*/
@@ -617,106 +615,106 @@ void PlayListWidget::btnPlay(bool b) {
617} 615}
618 616
619void PlayListWidget::deletePlaylist() { 617void PlayListWidget::deletePlaylist() {
620 switch( QMessageBox::information( this, (tr("Remove Playlist?")), 618 switch( QMessageBox::information( this, (tr("Remove Playlist?")),
621 (tr("You really want to delete\nthis playlist?")), 619 (tr("You really want to delete\nthis playlist?")),
622 (tr("Yes")), (tr("No")), 0 )){ 620 (tr("Yes")), (tr("No")), 0 )){
623 case 0: // Yes clicked, 621 case 0: // Yes clicked,
624 QFile().remove(playLists->selectedDocument().file()); 622 QFile().remove(playLists->selectedDocument().file());
625 QFile().remove(playLists->selectedDocument().linkFile()); 623 QFile().remove(playLists->selectedDocument().linkFile());
626 playLists->reread(); 624 playLists->reread();
627 break; 625 break;
628 case 1: // Cancel 626 case 1: // Cancel
629 break; 627 break;
630 }; 628 };
631} 629}
632 630
633 631
634void PlayListWidget::playSelected() { 632void PlayListWidget::playSelected() {
635 btnPlay( TRUE); 633 btnPlay( TRUE);
636} 634}
637 635
638 636
639void PlayListWidget::scanForAudio() { 637void PlayListWidget::scanForAudio() {
640 audioView->scanFiles(); 638 audioView->scanFiles();
641 audioScan = true; 639 audioView->scannedFiles() = true;
642 populateAudioView(); 640 populateAudioView();
643} 641}
644 642
645void PlayListWidget::scanForVideo() { 643void PlayListWidget::scanForVideo() {
646 videoView->scanFiles(); 644 videoView->scanFiles();
647 videoScan = true; 645 videoView->scannedFiles() = true;
648 populateVideoView(); 646 populateVideoView();
649} 647}
650 648
651void PlayListWidget::populateAudioView() { 649void PlayListWidget::populateAudioView() {
652 audioView->clear(); 650 audioView->clear();
653 StorageInfo storageInfo; 651 StorageInfo storageInfo;
654 // const QList<FileSystem> &fs = storageInfo.fileSystems(); 652 // const QList<FileSystem> &fs = storageInfo.fileSystems();
655 if(!audioScan) { 653 if(!audioView->scannedFiles()) {
656 scanForAudio(); 654 scanForAudio();
657 } 655 }
658 656
659 QListIterator<DocLnk> dit( audioView->files().children() ); 657 QListIterator<DocLnk> dit( audioView->files().children() );
660 // QListIterator<FileSystem> it ( fs ); 658 // QListIterator<FileSystem> it ( fs );
661 audioView->clear(); 659 audioView->clear();
662 660
663 QString storage; 661 QString storage;
664 for ( ; dit.current(); ++dit ) { 662 for ( ; dit.current(); ++dit ) {
665// // for( ; it.current(); ++it ){ 663// // for( ; it.current(); ++it ){
666// const QString name = (*dit)->name(); 664// const QString name = (*dit)->name();
667// const QString path = (*dit)->path(); 665// const QString path = (*dit)->path();
668// if(dit.current()->file().find(path) != -1 ) { 666// if(dit.current()->file().find(path) != -1 ) {
669// storage = name; 667// storage = name;
670// // } 668// // }
671// } 669// }
672 670
673 QListViewItem * newItem; 671 QListViewItem * newItem;
674 if ( QFile( dit.current()->file()).exists() || 672 if ( QFile( dit.current()->file()).exists() ||
675 dit.current()->file().left(4) == "http" ) { 673 dit.current()->file().left(4) == "http" ) {
676 long size; 674 long size;
677 if( dit.current()->file().left(4) == "http" ) 675 if( dit.current()->file().left(4) == "http" )
678 size=0; 676 size=0;
679 else 677 else
680 size = QFile( dit.current()->file() ).size(); 678 size = QFile( dit.current()->file() ).size();
681 679
682 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), 680 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
683 QString::number(size ), "" /*storage*/, 681 QString::number(size ), "" /*storage*/,
684 dit.current()->file() ); 682 dit.current()->file() );
685 newItem->setPixmap( 0, Resource::loadPixmap( "opieplayer2/musicfile" ) ); 683 newItem->setPixmap( 0, Resource::loadPixmap( "opieplayer2/musicfile" ) );
686// qDebug("<<<< "+dit.current()->file()); 684// qDebug("<<<< "+dit.current()->file());
687 } 685 }
688 } 686 }
689 audioPopulated=true; 687 audioPopulated=true;
690} 688}
691 689
692 690
693void PlayListWidget::populateVideoView() { 691void PlayListWidget::populateVideoView() {
694 videoView->clear(); 692 videoView->clear();
695 StorageInfo storageInfo; 693 StorageInfo storageInfo;
696 // const QList<FileSystem> &fs = storageInfo.fileSystems(); 694 // const QList<FileSystem> &fs = storageInfo.fileSystems();
697 695
698 if(!videoScan ) { 696 if(!videoView->scannedFiles()) {
699 scanForVideo(); 697 scanForVideo();
700 } 698 }
701 699
702 QListIterator<DocLnk> Vdit( videoView->files().children() ); 700 QListIterator<DocLnk> Vdit( videoView->files().children() );
703// QListIterator<FileSystem> it ( fs ); 701// QListIterator<FileSystem> it ( fs );
704 videoView->clear(); 702 videoView->clear();
705 QString storage, pathName; 703 QString storage, pathName;
706 for ( ; Vdit.current(); ++Vdit ) { 704 for ( ; Vdit.current(); ++Vdit ) {
707// // for( ; it.current(); ++it ) { 705// // for( ; it.current(); ++it ) {
708// const QString name = (*Vdit)->name(); 706// const QString name = (*Vdit)->name();
709// const QString path = (*Vdit)->path(); 707// const QString path = (*Vdit)->path();
710// if( Vdit.current()->file().find(path) != -1 ) { 708// if( Vdit.current()->file().find(path) != -1 ) {
711// storage=name; 709// storage=name;
712// pathName=path; 710// pathName=path;
713// // } 711// // }
714// } 712// }
715 713
716 QListViewItem * newItem; 714 QListViewItem * newItem;
717 if ( QFile( Vdit.current()->file() ).exists() ) { 715 if ( QFile( Vdit.current()->file() ).exists() ) {
718 newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), 716 newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
719 QString::number( QFile( Vdit.current()->file() ).size() ), 717 QString::number( QFile( Vdit.current()->file() ).size() ),
720 ""/*storage*/, Vdit.current()->file()); 718 ""/*storage*/, Vdit.current()->file());
721 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ) ); 719 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer2/videofile" ) );
722 } 720 }
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index e81ef3c..58efd47 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -73,49 +73,49 @@ public:
73 ~PlayListWidget(); 73 ~PlayListWidget();
74 74
75 // retrieve the current playlist entry (media file link) 75 // retrieve the current playlist entry (media file link)
76 const DocLnk *current() const; 76 const DocLnk *current() const;
77 void useSelectedDocument(); 77 void useSelectedDocument();
78 TabType currentTab() const; 78 TabType currentTab() const;
79 79
80 Entry currentEntry() const; 80 Entry currentEntry() const;
81 81
82public slots: 82public slots:
83 bool first(); 83 bool first();
84 bool last(); 84 bool last();
85 bool next(); 85 bool next();
86 bool prev(); 86 bool prev();
87 void writeDefaultPlaylist( ); 87 void writeDefaultPlaylist( );
88 QString currentFileListPathName() const; 88 QString currentFileListPathName() const;
89protected: 89protected:
90 void keyReleaseEvent( QKeyEvent *e); 90 void keyReleaseEvent( QKeyEvent *e);
91 91
92signals: 92signals:
93 void skinSelected(); 93 void skinSelected();
94 94
95private: 95private:
96 int defaultSkinIndex; 96 int defaultSkinIndex;
97 bool audioScan, videoScan, audioPopulated, videoPopulated; 97 bool audioPopulated, videoPopulated;
98 void readm3u(const QString &); 98 void readm3u(const QString &);
99 void readPls(const QString &); 99 void readPls(const QString &);
100 void initializeStates(); 100 void initializeStates();
101 void populateAudioView(); 101 void populateAudioView();
102 void populateVideoView(); 102 void populateVideoView();
103 103
104 QListView *currentFileListView() const; 104 QListView *currentFileListView() const;
105 105
106 bool inFileListMode() const; 106 bool inFileListMode() const;
107 107
108private slots: 108private slots:
109 void populateSkinsMenu(); 109 void populateSkinsMenu();
110 void skinsMenuActivated(int); 110 void skinsMenuActivated(int);
111 void pmViewActivated(int); 111 void pmViewActivated(int);
112 void writem3u(); 112 void writem3u();
113 void writeCurrentM3u(); 113 void writeCurrentM3u();
114 void scanForAudio(); 114 void scanForAudio();
115 void scanForVideo(); 115 void scanForVideo();
116 void openFile(); 116 void openFile();
117 void setDocument( const QString& fileref ); 117 void setDocument( const QString& fileref );
118 void addToSelection( const DocLnk& ); // Add a media file to the playlist 118 void addToSelection( const DocLnk& ); // Add a media file to the playlist
119 void addToSelection( QListViewItem* ); // Add a media file to the playlist 119 void addToSelection( QListViewItem* ); // Add a media file to the playlist
120 void clearList(); 120 void clearList();
121 void addAllToList(); 121 void addAllToList();