summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistfileview.cpp16
-rw-r--r--noncore/multimedia/opieplayer2/playlistfileview.h13
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp25
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.h2
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.cpp5
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidgetgui.h4
6 files changed, 37 insertions, 28 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.cpp b/noncore/multimedia/opieplayer2/playlistfileview.cpp
index c4f93e7..2726296 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.cpp
+++ b/noncore/multimedia/opieplayer2/playlistfileview.cpp
@@ -1,8 +1,10 @@
1 1
2#include "playlistfileview.h" 2#include "playlistfileview.h"
3 3
4PlayListFileView::PlayListFileView( QWidget *parent, const char *name ) 4#include <qpe/global.h>
5 : PlayListView( parent, name ) 5
6PlayListFileView::PlayListFileView( const QString &mimeTypePattern, QWidget *parent, const char *name )
7 : PlayListView( parent, name ), m_mimeTypePattern( mimeTypePattern )
6{ 8{
7 addColumn( tr( "Title" ), 140); 9 addColumn( tr( "Title" ), 140);
8 addColumn( tr( "Size" ), -1 ); 10 addColumn( tr( "Size" ), -1 );
@@ -20,5 +22,15 @@ PlayListFileView::~PlayListFileView()
20{ 22{
21} 23}
22 24
25void PlayListFileView::scanFiles()
26{
27 m_files.detachChildren();
28 QListIterator<DocLnk> sdit( m_files.children() );
29 for ( ; sdit.current(); ++sdit )
30 delete sdit.current();
31
32 Global::findDocuments( &m_files, m_mimeTypePattern );
33}
34
23/* vim: et sw=4 ts=4 35/* vim: et sw=4 ts=4
24 */ 36 */
diff --git a/noncore/multimedia/opieplayer2/playlistfileview.h b/noncore/multimedia/opieplayer2/playlistfileview.h
index eef4bd1..08db929 100644
--- a/noncore/multimedia/opieplayer2/playlistfileview.h
+++ b/noncore/multimedia/opieplayer2/playlistfileview.h
@@ -3,12 +3,23 @@
3 3
4#include "playlistview.h" 4#include "playlistview.h"
5 5
6#include <qpe/applnk.h>
7
6class PlayListFileView : public PlayListView 8class PlayListFileView : public PlayListView
7{ 9{
8 Q_OBJECT 10 Q_OBJECT
9public: 11public:
10 PlayListFileView( QWidget *parent, const char *name = 0 ); 12 PlayListFileView( const QString &mimeTypePattern, QWidget *parent, const char *name = 0 );
11 virtual ~PlayListFileView(); 13 virtual ~PlayListFileView();
14
15 DocLnkSet &files() { return m_files; }
16
17public slots:
18 void scanFiles();
19
20private:
21 QString m_mimeTypePattern;
22 DocLnkSet m_files;
12}; 23};
13 24
14#endif // PLAYLISTFILEVIEW_H 25#endif // PLAYLISTFILEVIEW_H
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 6bda71e..93e7919 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -49,6 +49,7 @@
49#include "mediaplayerstate.h" 49#include "mediaplayerstate.h"
50#include "inputDialog.h" 50#include "inputDialog.h"
51#include "om3u.h" 51#include "om3u.h"
52#include "playlistfileview.h"
52 53
53//only needed for the random play 54//only needed for the random play
54#include <stdlib.h> 55#include <stdlib.h>
@@ -61,9 +62,6 @@ extern MediaPlayerState *mediaPlayerState;
61// extern AudioWidget *audioUI; 62// extern AudioWidget *audioUI;
62// extern VideoWidget *videoUI; 63// extern VideoWidget *videoUI;
63 64
64QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg";
65// no m3u's here please
66
67PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name ) 65PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* parent, const char* name )
68 : PlayListWidgetGui( mediaPlayerState, parent, name ) { 66 : PlayListWidgetGui( mediaPlayerState, parent, name ) {
69 67
@@ -639,26 +637,13 @@ void PlayListWidget::playSelected() {
639 637
640 638
641void PlayListWidget::scanForAudio() { 639void PlayListWidget::scanForAudio() {
642// qDebug("scan for audio"); 640 audioView->scanFiles();
643 files.detachChildren();
644 QListIterator<DocLnk> sdit( files.children() );
645 for ( ; sdit.current(); ++sdit ) {
646 delete sdit.current();
647 }
648// Global::findDocuments( &files, "audio/*");
649 Global::findDocuments( &files, audioMimes);
650 audioScan = true; 641 audioScan = true;
651 populateAudioView(); 642 populateAudioView();
652} 643}
653 644
654void PlayListWidget::scanForVideo() { 645void PlayListWidget::scanForVideo() {
655// qDebug("scan for video"); 646 videoView->scanFiles();
656 vFiles.detachChildren();
657 QListIterator<DocLnk> sdit( vFiles.children() );
658 for ( ; sdit.current(); ++sdit ) {
659 delete sdit.current();
660 }
661 Global::findDocuments(&vFiles, "video/*");
662 videoScan = true; 647 videoScan = true;
663 populateVideoView(); 648 populateVideoView();
664} 649}
@@ -671,7 +656,7 @@ void PlayListWidget::populateAudioView() {
671 scanForAudio(); 656 scanForAudio();
672 } 657 }
673 658
674 QListIterator<DocLnk> dit( files.children() ); 659 QListIterator<DocLnk> dit( audioView->files().children() );
675 // QListIterator<FileSystem> it ( fs ); 660 // QListIterator<FileSystem> it ( fs );
676 audioView->clear(); 661 audioView->clear();
677 662
@@ -714,7 +699,7 @@ void PlayListWidget::populateVideoView() {
714 scanForVideo(); 699 scanForVideo();
715 } 700 }
716 701
717 QListIterator<DocLnk> Vdit( vFiles.children() ); 702 QListIterator<DocLnk> Vdit( videoView->files().children() );
718// QListIterator<FileSystem> it ( fs ); 703// QListIterator<FileSystem> it ( fs );
719 videoView->clear(); 704 videoView->clear();
720 QString storage, pathName; 705 QString storage, pathName;
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 62d78a2..e81ef3c 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -134,8 +134,6 @@ private slots:
134 void playSelected(); 134 void playSelected();
135 135
136private: 136private:
137 DocLnkSet files;
138 DocLnkSet vFiles;
139 bool fromSetDocument; 137 bool fromSetDocument;
140 bool insanityBool; 138 bool insanityBool;
141 QString setDocFileRef, currentPlayList; 139 QString setDocFileRef, currentPlayList;
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
index cfca5e3..a219cfd 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.cpp
@@ -150,7 +150,8 @@ PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidg
150 QGridLayout *Alayout = new QGridLayout( aTab ); 150 QGridLayout *Alayout = new QGridLayout( aTab );
151 Alayout->setSpacing( 2 ); 151 Alayout->setSpacing( 2 );
152 Alayout->setMargin( 2 ); 152 Alayout->setMargin( 2 );
153 audioView = new PlayListFileView( aTab, "Audioview" ); 153 // no m3u's here please
154 audioView = new PlayListFileView( "audio/mpeg;audio/x-wav;audio/x-ogg", aTab, "Audioview" );
154 Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 ); 155 Alayout->addMultiCellWidget( audioView, 0, 0, 0, 1 );
155 tabWidget->insertTab( aTab, tr( "Audio" ) ); 156 tabWidget->insertTab( aTab, tr( "Audio" ) );
156 157
@@ -162,7 +163,7 @@ PlayListWidgetGui::PlayListWidgetGui( MediaPlayerState &_mediaPlayerState, QWidg
162 QGridLayout *Vlayout = new QGridLayout( vTab ); 163 QGridLayout *Vlayout = new QGridLayout( vTab );
163 Vlayout->setSpacing( 2 ); 164 Vlayout->setSpacing( 2 );
164 Vlayout->setMargin( 2 ); 165 Vlayout->setMargin( 2 );
165 videoView = new PlayListFileView( vTab, "Videoview" ); 166 videoView = new PlayListFileView( "video/*", vTab, "Videoview" );
166 Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 ); 167 Vlayout->addMultiCellWidget( videoView, 0, 0, 0, 1 );
167 168
168 QPEApplication::setStylusOperation( videoView->viewport(), QPEApplication::RightOnHold ); 169 QPEApplication::setStylusOperation( videoView->viewport(), QPEApplication::RightOnHold );
diff --git a/noncore/multimedia/opieplayer2/playlistwidgetgui.h b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
index 9b5252a..0d8af43 100644
--- a/noncore/multimedia/opieplayer2/playlistwidgetgui.h
+++ b/noncore/multimedia/opieplayer2/playlistwidgetgui.h
@@ -50,6 +50,7 @@
50class PlayListWidgetPrivate; 50class PlayListWidgetPrivate;
51class PlayListSelection; 51class PlayListSelection;
52class MediaPlayerState; 52class MediaPlayerState;
53class PlayListFileView;
53 54
54class Config; 55class Config;
55class QPEToolBar; 56class QPEToolBar;
@@ -101,7 +102,8 @@ public:
101 102
102protected: 103protected:
103 QTabWidget * tabWidget; 104 QTabWidget * tabWidget;
104 QListView *audioView, *videoView, *playlistView; 105 PlayListFileView *audioView, *videoView;
106 QListView *playlistView;
105 QLabel *libString; 107 QLabel *libString;
106 QPopupMenu *pmView ; 108 QPopupMenu *pmView ;
107 QPopupMenu *gammaMenu; 109 QPopupMenu *gammaMenu;