-rw-r--r-- | noncore/multimedia/opieplayer2/playlistfileview.cpp | 14 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistfileview.h | 1 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 30 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.h | 3 |
4 files changed, 20 insertions, 28 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.cpp b/noncore/multimedia/opieplayer2/playlistfileview.cpp index 0ed1061..cb16415 100644 --- a/noncore/multimedia/opieplayer2/playlistfileview.cpp +++ b/noncore/multimedia/opieplayer2/playlistfileview.cpp | |||
@@ -1,21 +1,22 @@ | |||
1 | 1 | ||
2 | #include "playlistfileview.h" | 2 | #include "playlistfileview.h" |
3 | 3 | ||
4 | #include <qfile.h> | 4 | #include <qfile.h> |
5 | #include <qpe/global.h> | 5 | #include <qpe/global.h> |
6 | #include <qpe/resource.h> | 6 | #include <qpe/resource.h> |
7 | 7 | ||
8 | PlayListFileView::PlayListFileView( const QString &mimeTypePattern, const QString &itemPixmapName, QWidget *parent, const char *name ) | 8 | PlayListFileView::PlayListFileView( const QString &mimeTypePattern, const QString &itemPixmapName, QWidget *parent, const char *name ) |
9 | : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern ), m_itemPixmapName( itemPixmapName ), m_scannedFiles( false ) | 9 | : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern ), m_itemPixmapName( itemPixmapName ), m_scannedFiles( false ), |
10 | m_viewPopulated( false ) | ||
10 | { | 11 | { |
11 | addColumn( tr( "Title" ), 140); | 12 | addColumn( tr( "Title" ), 140); |
12 | addColumn( tr( "Size" ), -1 ); | 13 | addColumn( tr( "Size" ), -1 ); |
13 | addColumn(tr( "Media" ), 0 ); | 14 | addColumn(tr( "Media" ), 0 ); |
14 | addColumn(tr( "Path" ), -1 ); | 15 | addColumn(tr( "Path" ), -1 ); |
15 | setColumnAlignment( 1, Qt::AlignRight ); | 16 | setColumnAlignment( 1, Qt::AlignRight ); |
16 | setColumnAlignment( 2, Qt::AlignRight ); | 17 | setColumnAlignment( 2, Qt::AlignRight ); |
17 | setAllColumnsShowFocus( TRUE ); | 18 | setAllColumnsShowFocus( TRUE ); |
18 | setSorting( 3, TRUE ); | 19 | setSorting( 3, TRUE ); |
19 | setMultiSelection( TRUE ); | 20 | setMultiSelection( TRUE ); |
20 | setSelectionMode( QListView::Extended ); | 21 | setSelectionMode( QListView::Extended ); |
21 | } | 22 | } |
@@ -23,35 +24,46 @@ PlayListFileView::PlayListFileView( const QString &mimeTypePattern, const QStrin | |||
23 | PlayListFileView::~PlayListFileView() | 24 | PlayListFileView::~PlayListFileView() |
24 | { | 25 | { |
25 | } | 26 | } |
26 | 27 | ||
27 | void PlayListFileView::scanFiles() | 28 | void PlayListFileView::scanFiles() |
28 | { | 29 | { |
29 | m_files.detachChildren(); | 30 | m_files.detachChildren(); |
30 | QListIterator<DocLnk> sdit( m_files.children() ); | 31 | QListIterator<DocLnk> sdit( m_files.children() ); |
31 | for ( ; sdit.current(); ++sdit ) | 32 | for ( ; sdit.current(); ++sdit ) |
32 | delete sdit.current(); | 33 | delete sdit.current(); |
33 | 34 | ||
34 | Global::findDocuments( &m_files, m_mimeTypePattern ); | 35 | Global::findDocuments( &m_files, m_mimeTypePattern ); |
36 | |||
37 | if ( m_viewPopulated ) { | ||
38 | m_viewPopulated = false; | ||
39 | populateView(); | ||
40 | } | ||
35 | } | 41 | } |
36 | 42 | ||
37 | void PlayListFileView::populateView() | 43 | void PlayListFileView::populateView() |
38 | { | 44 | { |
45 | if ( m_viewPopulated ) | ||
46 | return; | ||
47 | |||
39 | clear(); | 48 | clear(); |
40 | 49 | ||
41 | if( !m_scannedFiles ) { | 50 | if( !m_scannedFiles ) { |
51 | m_viewPopulated = false; // avoid a recursion :) | ||
42 | scanFiles(); | 52 | scanFiles(); |
43 | m_scannedFiles = true; | 53 | m_scannedFiles = true; |
44 | } | 54 | } |
45 | 55 | ||
56 | m_viewPopulated = true; | ||
57 | |||
46 | QString storage; | 58 | QString storage; |
47 | QListIterator<DocLnk> dit( m_files.children() ); | 59 | QListIterator<DocLnk> dit( m_files.children() ); |
48 | for ( ; dit.current(); ++dit ) { | 60 | for ( ; dit.current(); ++dit ) { |
49 | 61 | ||
50 | QListViewItem *newItem; | 62 | QListViewItem *newItem; |
51 | 63 | ||
52 | if ( QFile::exists( dit.current()->file() ) || | 64 | if ( QFile::exists( dit.current()->file() ) || |
53 | dit.current()->file().left( 4 ) == "http" ) { | 65 | dit.current()->file().left( 4 ) == "http" ) { |
54 | 66 | ||
55 | unsigned long size = QFile( dit.current()->file() ).size(); | 67 | unsigned long size = QFile( dit.current()->file() ).size(); |
56 | 68 | ||
57 | newItem = new QListViewItem( this, dit.current()->name(), | 69 | newItem = new QListViewItem( this, dit.current()->name(), |
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.h b/noncore/multimedia/opieplayer2/playlistfileview.h index a00349e..448473e 100644 --- a/noncore/multimedia/opieplayer2/playlistfileview.h +++ b/noncore/multimedia/opieplayer2/playlistfileview.h | |||
@@ -17,17 +17,18 @@ public: | |||
17 | DocLnkSet &files() { return m_files; } | 17 | DocLnkSet &files() { return m_files; } |
18 | bool &scannedFiles() { return m_scannedFiles; } | 18 | bool &scannedFiles() { return m_scannedFiles; } |
19 | 19 | ||
20 | public slots: | 20 | public slots: |
21 | void scanFiles(); | 21 | void scanFiles(); |
22 | void populateView(); | 22 | void populateView(); |
23 | 23 | ||
24 | private: | 24 | private: |
25 | QString m_mimeTypePattern; | 25 | QString m_mimeTypePattern; |
26 | QString m_itemPixmapName; | 26 | QString m_itemPixmapName; |
27 | DocLnkSet m_files; | 27 | DocLnkSet m_files; |
28 | bool m_scannedFiles; | 28 | bool m_scannedFiles; |
29 | bool m_viewPopulated; | ||
29 | }; | 30 | }; |
30 | 31 | ||
31 | #endif // PLAYLISTFILEVIEW_H | 32 | #endif // PLAYLISTFILEVIEW_H |
32 | /* vim: et sw=4 ts=4 | 33 | /* vim: et sw=4 ts=4 |
33 | */ | 34 | */ |
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp index 460a0bf..eb0606d 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.cpp +++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp | |||
@@ -142,26 +142,24 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par | |||
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 | audioPopulated=false; | ||
155 | videoPopulated=false; | ||
156 | populateSkinsMenu(); | 154 | populateSkinsMenu(); |
157 | initializeStates(); | 155 | initializeStates(); |
158 | 156 | ||
159 | cfg.setGroup("PlayList"); | 157 | cfg.setGroup("PlayList"); |
160 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); | 158 | QString currentPlaylist = cfg.readEntry( "CurrentPlaylist", "default"); |
161 | loadList(DocLnk( currentPlaylist ) ); | 159 | loadList(DocLnk( currentPlaylist ) ); |
162 | } | 160 | } |
163 | 161 | ||
164 | 162 | ||
165 | PlayListWidget::~PlayListWidget() { | 163 | PlayListWidget::~PlayListWidget() { |
166 | delete d; | 164 | delete d; |
167 | } | 165 | } |
@@ -245,41 +243,41 @@ void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *, const QPoi | |||
245 | break; | 243 | break; |
246 | } | 244 | } |
247 | } | 245 | } |
248 | 246 | ||
249 | 247 | ||
250 | void PlayListWidget::addAllToList() { | 248 | void PlayListWidget::addAllToList() { |
251 | 249 | ||
252 | // QTime t; | 250 | // QTime t; |
253 | // t.start(); | 251 | // t.start(); |
254 | 252 | ||
255 | if(!audioView->scannedFiles()) { | 253 | if(!audioView->scannedFiles()) { |
256 | if(audioView->childCount() < 1) | 254 | if(audioView->childCount() < 1) |
257 | populateAudioView(); | 255 | audioView->populateView(); |
258 | } | 256 | } |
259 | 257 | ||
260 | QListViewItemIterator audioIt( audioView ); | 258 | QListViewItemIterator audioIt( audioView ); |
261 | DocLnk lnk; | 259 | DocLnk lnk; |
262 | QString filename; | 260 | QString filename; |
263 | // iterate through all items of the listview | 261 | // iterate through all items of the listview |
264 | for ( ; audioIt.current(); ++audioIt ) { | 262 | for ( ; audioIt.current(); ++audioIt ) { |
265 | filename = audioIt.current()->text(3); | 263 | filename = audioIt.current()->text(3); |
266 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 264 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
267 | lnk.setFile( filename ); //sets file name | 265 | lnk.setFile( filename ); //sets file name |
268 | d->selectedFiles->addToSelection( lnk); | 266 | d->selectedFiles->addToSelection( lnk); |
269 | } | 267 | } |
270 | 268 | ||
271 | if(!videoView->scannedFiles()) { | 269 | if(!videoView->scannedFiles()) { |
272 | if(videoView->childCount() < 1) | 270 | if(videoView->childCount() < 1) |
273 | populateVideoView(); | 271 | videoView->populateView(); |
274 | } | 272 | } |
275 | 273 | ||
276 | QListViewItemIterator videoIt( videoView ); | 274 | QListViewItemIterator videoIt( videoView ); |
277 | for ( ; videoIt.current(); ++videoIt ) { | 275 | for ( ; videoIt.current(); ++videoIt ) { |
278 | filename = videoIt.current()->text(3); | 276 | filename = videoIt.current()->text(3); |
279 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 277 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
280 | lnk.setFile( filename ); //sets file name | 278 | lnk.setFile( filename ); //sets file name |
281 | d->selectedFiles->addToSelection( lnk); | 279 | d->selectedFiles->addToSelection( lnk); |
282 | } | 280 | } |
283 | 281 | ||
284 | // d->selectedFiles->addToSelection( ); | 282 | // d->selectedFiles->addToSelection( ); |
285 | // if ( it.current()->isSelected() ) | 283 | // if ( it.current()->isSelected() ) |
@@ -305,25 +303,25 @@ void PlayListWidget::addAllToList() { | |||
305 | 303 | ||
306 | tabWidget->setCurrentPage(0); | 304 | tabWidget->setCurrentPage(0); |
307 | 305 | ||
308 | writeCurrentM3u(); | 306 | writeCurrentM3u(); |
309 | d->selectedFiles->first(); | 307 | d->selectedFiles->first(); |
310 | } | 308 | } |
311 | 309 | ||
312 | 310 | ||
313 | void PlayListWidget::addAllMusicToList() { | 311 | void PlayListWidget::addAllMusicToList() { |
314 | 312 | ||
315 | if(!audioView->scannedFiles()) { | 313 | if(!audioView->scannedFiles()) { |
316 | if(audioView->childCount() < 1) | 314 | if(audioView->childCount() < 1) |
317 | populateAudioView(); | 315 | audioView->populateView(); |
318 | } | 316 | } |
319 | 317 | ||
320 | QListViewItemIterator audioIt( audioView ); | 318 | QListViewItemIterator audioIt( audioView ); |
321 | DocLnk lnk; | 319 | DocLnk lnk; |
322 | QString filename; | 320 | QString filename; |
323 | // iterate through all items of the listview | 321 | // iterate through all items of the listview |
324 | for ( ; audioIt.current(); ++audioIt ) { | 322 | for ( ; audioIt.current(); ++audioIt ) { |
325 | filename = audioIt.current()->text(3); | 323 | filename = audioIt.current()->text(3); |
326 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 324 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
327 | lnk.setFile( filename ); //sets file name | 325 | lnk.setFile( filename ); //sets file name |
328 | d->selectedFiles->addToSelection( lnk); | 326 | d->selectedFiles->addToSelection( lnk); |
329 | } | 327 | } |
@@ -338,25 +336,25 @@ void PlayListWidget::addAllMusicToList() { | |||
338 | } | 336 | } |
339 | */ | 337 | */ |
340 | tabWidget->setCurrentPage(0); | 338 | tabWidget->setCurrentPage(0); |
341 | writeCurrentM3u(); | 339 | writeCurrentM3u(); |
342 | d->selectedFiles->first(); | 340 | d->selectedFiles->first(); |
343 | } | 341 | } |
344 | 342 | ||
345 | 343 | ||
346 | void PlayListWidget::addAllVideoToList() { | 344 | void PlayListWidget::addAllVideoToList() { |
347 | 345 | ||
348 | if(!videoView->scannedFiles()) { | 346 | if(!videoView->scannedFiles()) { |
349 | if(videoView->childCount() < 1) | 347 | if(videoView->childCount() < 1) |
350 | populateVideoView(); | 348 | videoView->populateView(); |
351 | } | 349 | } |
352 | 350 | ||
353 | QListViewItemIterator videoIt( videoView ); | 351 | QListViewItemIterator videoIt( videoView ); |
354 | DocLnk lnk; | 352 | DocLnk lnk; |
355 | QString filename; | 353 | QString filename; |
356 | for ( ; videoIt.current(); ++videoIt ) { | 354 | for ( ; videoIt.current(); ++videoIt ) { |
357 | filename = videoIt.current()->text(3); | 355 | filename = videoIt.current()->text(3); |
358 | lnk.setName( QFileInfo(filename).baseName() ); //sets name | 356 | lnk.setName( QFileInfo(filename).baseName() ); //sets name |
359 | lnk.setFile( filename ); //sets file name | 357 | lnk.setFile( filename ); //sets file name |
360 | d->selectedFiles->addToSelection( lnk); | 358 | d->selectedFiles->addToSelection( lnk); |
361 | } | 359 | } |
362 | 360 | ||
@@ -563,38 +561,36 @@ void PlayListWidget::tabChanged(QWidget *) { | |||
563 | { | 561 | { |
564 | if( !tbDeletePlaylist->isHidden() ) { | 562 | if( !tbDeletePlaylist->isHidden() ) { |
565 | tbDeletePlaylist->hide(); | 563 | tbDeletePlaylist->hide(); |
566 | } | 564 | } |
567 | d->tbRemoveFromList->setEnabled(TRUE); | 565 | d->tbRemoveFromList->setEnabled(TRUE); |
568 | d->tbAddToList->setEnabled(FALSE); | 566 | d->tbAddToList->setEnabled(FALSE); |
569 | 567 | ||
570 | d->tbPlay->setEnabled( !d->selectedFiles->isEmpty() ); | 568 | d->tbPlay->setEnabled( !d->selectedFiles->isEmpty() ); |
571 | } | 569 | } |
572 | break; | 570 | break; |
573 | case AudioFiles: | 571 | case AudioFiles: |
574 | { | 572 | { |
575 | // audioView->clear(); | 573 | audioView->populateView(); |
576 | if(!audioPopulated) populateAudioView(); | ||
577 | 574 | ||
578 | if( !tbDeletePlaylist->isHidden() ) { | 575 | if( !tbDeletePlaylist->isHidden() ) { |
579 | tbDeletePlaylist->hide(); | 576 | tbDeletePlaylist->hide(); |
580 | } | 577 | } |
581 | d->tbRemoveFromList->setEnabled(FALSE); | 578 | d->tbRemoveFromList->setEnabled(FALSE); |
582 | d->tbAddToList->setEnabled(TRUE); | 579 | d->tbAddToList->setEnabled(TRUE); |
583 | } | 580 | } |
584 | break; | 581 | break; |
585 | case VideoFiles: | 582 | case VideoFiles: |
586 | { | 583 | { |
587 | // videoView->clear(); | 584 | videoView->populateView(); |
588 | if(!videoPopulated) populateVideoView(); | ||
589 | if( !tbDeletePlaylist->isHidden() ) { | 585 | if( !tbDeletePlaylist->isHidden() ) { |
590 | tbDeletePlaylist->hide(); | 586 | tbDeletePlaylist->hide(); |
591 | } | 587 | } |
592 | d->tbRemoveFromList->setEnabled(FALSE); | 588 | d->tbRemoveFromList->setEnabled(FALSE); |
593 | d->tbAddToList->setEnabled(TRUE); | 589 | d->tbAddToList->setEnabled(TRUE); |
594 | } | 590 | } |
595 | break; | 591 | break; |
596 | case PlayLists: | 592 | case PlayLists: |
597 | { | 593 | { |
598 | if( tbDeletePlaylist->isHidden() ) { | 594 | if( tbDeletePlaylist->isHidden() ) { |
599 | tbDeletePlaylist->show(); | 595 | tbDeletePlaylist->show(); |
600 | } | 596 | } |
@@ -627,42 +623,28 @@ void PlayListWidget::deletePlaylist() { | |||
627 | break; | 623 | break; |
628 | }; | 624 | }; |
629 | } | 625 | } |
630 | 626 | ||
631 | 627 | ||
632 | void PlayListWidget::playSelected() { | 628 | void PlayListWidget::playSelected() { |
633 | btnPlay( TRUE); | 629 | btnPlay( TRUE); |
634 | } | 630 | } |
635 | 631 | ||
636 | 632 | ||
637 | void PlayListWidget::scanForAudio() { | 633 | void PlayListWidget::scanForAudio() { |
638 | audioView->scanFiles(); | 634 | audioView->scanFiles(); |
639 | audioView->scannedFiles() = true; | ||
640 | populateAudioView(); | ||
641 | } | 635 | } |
642 | 636 | ||
643 | void PlayListWidget::scanForVideo() { | 637 | void PlayListWidget::scanForVideo() { |
644 | videoView->scanFiles(); | 638 | videoView->scanFiles(); |
645 | videoView->scannedFiles() = true; | ||
646 | populateVideoView(); | ||
647 | } | ||
648 | |||
649 | void PlayListWidget::populateAudioView() { | ||
650 | audioView->populateView(); | ||
651 | audioPopulated = true; | ||
652 | } | ||
653 | |||
654 | void PlayListWidget::populateVideoView() { | ||
655 | videoView->populateView(); | ||
656 | videoPopulated=true; | ||
657 | } | 639 | } |
658 | 640 | ||
659 | QListView *PlayListWidget::currentFileListView() const | 641 | QListView *PlayListWidget::currentFileListView() const |
660 | { | 642 | { |
661 | switch ( currentTab() ) { | 643 | switch ( currentTab() ) { |
662 | case AudioFiles: return audioView; | 644 | case AudioFiles: return audioView; |
663 | case VideoFiles: return videoView; | 645 | case VideoFiles: return videoView; |
664 | default: assert( false ); | 646 | default: assert( false ); |
665 | } | 647 | } |
666 | return 0; | 648 | return 0; |
667 | } | 649 | } |
668 | 650 | ||
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h index 58efd47..8c22f17 100644 --- a/noncore/multimedia/opieplayer2/playlistwidget.h +++ b/noncore/multimedia/opieplayer2/playlistwidget.h | |||
@@ -85,30 +85,27 @@ public slots: | |||
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; |
89 | protected: | 89 | protected: |
90 | void keyReleaseEvent( QKeyEvent *e); | 90 | void keyReleaseEvent( QKeyEvent *e); |
91 | 91 | ||
92 | signals: | 92 | signals: |
93 | void skinSelected(); | 93 | void skinSelected(); |
94 | 94 | ||
95 | private: | 95 | private: |
96 | int defaultSkinIndex; | 96 | int defaultSkinIndex; |
97 | bool audioPopulated, videoPopulated; | ||
98 | void readm3u(const QString &); | 97 | void readm3u(const QString &); |
99 | void readPls(const QString &); | 98 | void readPls(const QString &); |
100 | void initializeStates(); | 99 | void initializeStates(); |
101 | void populateAudioView(); | ||
102 | void populateVideoView(); | ||
103 | 100 | ||
104 | QListView *currentFileListView() const; | 101 | QListView *currentFileListView() const; |
105 | 102 | ||
106 | bool inFileListMode() const; | 103 | bool inFileListMode() const; |
107 | 104 | ||
108 | private slots: | 105 | private slots: |
109 | void populateSkinsMenu(); | 106 | void populateSkinsMenu(); |
110 | void skinsMenuActivated(int); | 107 | void skinsMenuActivated(int); |
111 | void pmViewActivated(int); | 108 | void pmViewActivated(int); |
112 | void writem3u(); | 109 | void writem3u(); |
113 | void writeCurrentM3u(); | 110 | void writeCurrentM3u(); |
114 | void scanForAudio(); | 111 | void scanForAudio(); |