author | simon <simon> | 2002-12-04 11:55:24 (UTC) |
---|---|---|
committer | simon <simon> | 2002-12-04 11:55:24 (UTC) |
commit | ba2de7d7233c0fbbd8ef31fae7aa5a9ded70225e (patch) (unidiff) | |
tree | b84f73c9df4610b4cf957031c8ca7d0ece407614 | |
parent | d75c4d9a27fcfc38ac3f9fd58f6b398809ec6a94 (diff) | |
download | opie-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
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.cpp | 13 | ||||
-rw-r--r-- | noncore/multimedia/opieplayer2/playlistwidget.h | 2 |
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 | |||
@@ -95,9 +95,9 @@ PlayListWidget::PlayListWidget( MediaPlayerState &mediaPlayerState, QWidget* par | |||
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() ) ); |
@@ -617,15 +617,6 @@ void PlayListWidget::playSelected() { | |||
617 | btnPlay( TRUE); | 617 | btnPlay( TRUE); |
618 | } | 618 | } |
619 | 619 | ||
620 | |||
621 | void PlayListWidget::scanForAudio() { | ||
622 | audioView->scanFiles(); | ||
623 | } | ||
624 | |||
625 | void PlayListWidget::scanForVideo() { | ||
626 | videoView->scanFiles(); | ||
627 | } | ||
628 | |||
629 | QListView *PlayListWidget::currentFileListView() const | 620 | QListView *PlayListWidget::currentFileListView() const |
630 | { | 621 | { |
631 | switch ( currentTab() ) { | 622 | switch ( currentTab() ) { |
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 | |||
@@ -108,8 +108,6 @@ private slots: | |||
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 |