summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-04 11:55:24 (UTC)
committer simon <simon>2002-12-04 11:55:24 (UTC)
commitba2de7d7233c0fbbd8ef31fae7aa5a9ded70225e (patch) (unidiff)
treeb84f73c9df4610b4cf957031c8ca7d0ece407614
parentd75c4d9a27fcfc38ac3f9fd58f6b398809ec6a94 (diff)
downloadopie-ba2de7d7233c0fbbd8ef31fae7aa5a9ded70225e.zip
opie-ba2de7d7233c0fbbd8ef31fae7aa5a9ded70225e.tar.gz
opie-ba2de7d7233c0fbbd8ef31fae7aa5a9ded70225e.tar.bz2
- scanForAudio and scanForVideo is scanFiles in the file list view, so
removed the former and connect to the latter
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp13
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.h2
2 files changed, 2 insertions, 13 deletions
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index e754067..86b3424 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -92,15 +92,15 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par
92 this, SLOT(writem3u() ) ); 92 this, SLOT(writem3u() ) );
93 pmPlayList->insertSeparator(-1); 93 pmPlayList->insertSeparator(-1);
94 (void)new MenuItem( pmPlayList, tr( "Open File or URL" ), 94 (void)new MenuItem( pmPlayList, tr( "Open File or URL" ),
95 this,SLOT( openFile() ) ); 95 this,SLOT( openFile() ) );
96 pmPlayList->insertSeparator(-1); 96 pmPlayList->insertSeparator(-1);
97 (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), 97 (void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ),
98 this,SLOT( scanForAudio() ) ); 98 audioView, SLOT( scanFiles() ) );
99 (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), 99 (void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ),
100 this,SLOT( scanForVideo() ) ); 100 videoView, SLOT( scanFiles() ) );
101 101
102 pmView->insertItem( Resource::loadPixmap("fullscreen") , tr( "Full Screen"), 102 pmView->insertItem( Resource::loadPixmap("fullscreen") , tr( "Full Screen"),
103 &mediaPlayerState, SLOT( toggleFullscreen() ) ); 103 &mediaPlayerState, SLOT( toggleFullscreen() ) );
104 104
105 Config cfg( "OpiePlayer" ); 105 Config cfg( "OpiePlayer" );
106 bool b= cfg.readBoolEntry("FullScreen", 0); 106 bool b= cfg.readBoolEntry("FullScreen", 0);
@@ -614,21 +614,12 @@ void PlayListWidget::deletePlaylist() {
614 614
615 615
616void PlayListWidget::playSelected() { 616void PlayListWidget::playSelected() {
617 btnPlay( TRUE); 617 btnPlay( TRUE);
618} 618}
619 619
620
621void PlayListWidget::scanForAudio() {
622 audioView->scanFiles();
623}
624
625void PlayListWidget::scanForVideo() {
626 videoView->scanFiles();
627}
628
629QListView *PlayListWidget::currentFileListView() const 620QListView *PlayListWidget::currentFileListView() const
630{ 621{
631 switch ( currentTab() ) { 622 switch ( currentTab() ) {
632 case AudioFiles: return audioView; 623 case AudioFiles: return audioView;
633 case VideoFiles: return videoView; 624 case VideoFiles: return videoView;
634 default: assert( false ); 625 default: assert( false );
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.h b/noncore/multimedia/opieplayer2/playlistwidget.h
index 8c22f17..5c8f30c 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.h
+++ b/noncore/multimedia/opieplayer2/playlistwidget.h
@@ -105,14 +105,12 @@ private:
105private slots: 105private slots:
106 void populateSkinsMenu(); 106 void populateSkinsMenu();
107 void skinsMenuActivated(int); 107 void skinsMenuActivated(int);
108 void pmViewActivated(int); 108 void pmViewActivated(int);
109 void writem3u(); 109 void writem3u();
110 void writeCurrentM3u(); 110 void writeCurrentM3u();
111 void scanForAudio();
112 void scanForVideo();
113 void openFile(); 111 void openFile();
114 void setDocument( const QString& fileref ); 112 void setDocument( const QString& fileref );
115 void addToSelection( const DocLnk& ); // Add a media file to the playlist 113 void addToSelection( const DocLnk& ); // Add a media file to the playlist
116 void addToSelection( QListViewItem* ); // Add a media file to the playlist 114 void addToSelection( QListViewItem* ); // Add a media file to the playlist
117 void clearList(); 115 void clearList();
118 void addAllToList(); 116 void addAllToList();