summaryrefslogtreecommitdiff
authorsimon <simon>2002-12-04 11:55:24 (UTC)
committer simon <simon>2002-12-04 11:55:24 (UTC)
commitba2de7d7233c0fbbd8ef31fae7aa5a9ded70225e (patch) (side-by-side diff)
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) (show 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
this, SLOT(writem3u() ) );
pmPlayList->insertSeparator(-1);
(void)new MenuItem( pmPlayList, tr( "Open File or URL" ),
this,SLOT( openFile() ) );
pmPlayList->insertSeparator(-1);
(void)new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ),
- this,SLOT( scanForAudio() ) );
+ audioView, SLOT( scanFiles() ) );
(void)new MenuItem( pmPlayList, tr( "Rescan for Video Files" ),
- this,SLOT( scanForVideo() ) );
+ videoView, SLOT( scanFiles() ) );
pmView->insertItem( Resource::loadPixmap("fullscreen") , tr( "Full Screen"),
&mediaPlayerState, SLOT( toggleFullscreen() ) );
Config cfg( "OpiePlayer" );
bool b= cfg.readBoolEntry("FullScreen", 0);
@@ -614,21 +614,12 @@ void PlayListWidget::deletePlaylist() {
void PlayListWidget::playSelected() {
btnPlay( TRUE);
}
-
-void PlayListWidget::scanForAudio() {
- audioView->scanFiles();
-}
-
-void PlayListWidget::scanForVideo() {
- videoView->scanFiles();
-}
-
QListView *PlayListWidget::currentFileListView() const
{
switch ( currentTab() ) {
case AudioFiles: return audioView;
case VideoFiles: return videoView;
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:
private slots:
void populateSkinsMenu();
void skinsMenuActivated(int);
void pmViewActivated(int);
void writem3u();
void writeCurrentM3u();
- void scanForAudio();
- void scanForVideo();
void openFile();
void setDocument( const QString& fileref );
void addToSelection( const DocLnk& ); // Add a media file to the playlist
void addToSelection( QListViewItem* ); // Add a media file to the playlist
void clearList();
void addAllToList();