| -rw-r--r-- | noncore/multimedia/opieplayer3/audiowidget.cpp | 33 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer3/audiowidget.h | 4 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer3/mwindow.cpp | 180 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer3/mwindow.h | 16 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer3/opieplayer3.pro | 4 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer3/playlist.cpp | 131 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer3/playlist.h | 8 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer3/videowidget.cpp | 39 | ||||
| -rw-r--r-- | noncore/multimedia/opieplayer3/videowidget.h | 4 |
9 files changed, 353 insertions, 66 deletions
diff --git a/noncore/multimedia/opieplayer3/audiowidget.cpp b/noncore/multimedia/opieplayer3/audiowidget.cpp index 7ba6274..b435c1b 100644 --- a/noncore/multimedia/opieplayer3/audiowidget.cpp +++ b/noncore/multimedia/opieplayer3/audiowidget.cpp @@ -19,2 +19,3 @@ AudioWidget::AudioWidget( QWidget * parent, const char * name, WFlags f) m_InfoBox = new QTextView(this);
+#if 0
m_PosSlider = new QSlider(QSlider::Horizontal,this);
@@ -27,2 +28,3 @@ AudioWidget::AudioWidget( QWidget * parent, const char * name, WFlags f) m_uppos=0;
+#endif
}
@@ -33,7 +35,9 @@ AudioWidget::~AudioWidget() -void AudioWidget::slotNewPos(int pos)
+void AudioWidget::slotNewPos(int /* pos*/)
{
if (!m_xineLib) return;
+#if 0
if (m_uppos==pos) return;
m_xineLib->seekTo(pos);
+#endif
}
@@ -42,3 +46,5 @@ void AudioWidget::sliderPressed() {
+#if 0
m_pressed = true;
+#endif
}
@@ -47,3 +53,5 @@ void AudioWidget::sliderReleased() {
+#if 0
m_pressed = false;
+#endif
}
@@ -59,3 +67,3 @@ void AudioWidget::closeEvent(QCloseEvent*e) -void AudioWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib)
+int AudioWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib)
{
@@ -63,3 +71,3 @@ void AudioWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib) if (m_xineLib != aLib) {
- disconnect(m_xineLib);
+ if (m_xineLib) disconnect(m_xineLib);
m_xineLib = aLib;
@@ -67,8 +75,13 @@ void AudioWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib) if (!m_xineLib) {
- return;
+ return -1;
}
+#if 0
m_uppos=0;
m_PosSlider->setValue(0);
+#endif
m_xineLib->setShowVideo(false);
- m_xineLib->play(m_current.file());
+ int res = m_xineLib->play(m_current.file());
+ if (res != 1) {
+ return -2;
+ }
// title
@@ -81,3 +94,6 @@ void AudioWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib) int l = m_xineLib->length();
+ int tmp = l;
+#if 0
m_PosSlider->setRange(0,l);
+#endif
QString laenge="";
@@ -104,2 +120,4 @@ void AudioWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib) text+="<H2><center>"+title+"</center></h2>";
+ } else {
+ text+="<H2><center>"+m_current.name()+"</center></h2>";
}
@@ -110,2 +128,3 @@ void AudioWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib) m_InfoBox->setText(text);
+ return tmp;
}
@@ -119,4 +138,5 @@ void AudioWidget::stopPlaying() -void AudioWidget::updatePos(int val)
+void AudioWidget::updatePos(int /* val */)
{
+#if 0
if (m_pressed) return;
@@ -124,2 +144,3 @@ void AudioWidget::updatePos(int val) m_PosSlider->setValue(val);
+#endif
}
diff --git a/noncore/multimedia/opieplayer3/audiowidget.h b/noncore/multimedia/opieplayer3/audiowidget.h index 07b51b6..5e5dc09 100644 --- a/noncore/multimedia/opieplayer3/audiowidget.h +++ b/noncore/multimedia/opieplayer3/audiowidget.h @@ -23,3 +23,3 @@ public: - void playFile(const DocLnk&,XINE::Lib*);
+ int playFile(const DocLnk&,XINE::Lib*);
@@ -34,2 +34,3 @@ protected: QTextView*m_InfoBox;
+#if 0
QSlider*m_PosSlider;
@@ -37,2 +38,3 @@ protected: int m_uppos;
+#endif
diff --git a/noncore/multimedia/opieplayer3/mwindow.cpp b/noncore/multimedia/opieplayer3/mwindow.cpp index dab910a..57418f0 100644 --- a/noncore/multimedia/opieplayer3/mwindow.cpp +++ b/noncore/multimedia/opieplayer3/mwindow.cpp @@ -52,2 +52,4 @@ #include <qtimer.h>
+#include <qslider.h>
+#include <qlayout.h>
@@ -61,12 +63,17 @@ PMainWindow::PMainWindow(QWidget*w, const char*name, WFlags f) setCaption( QObject::tr("Opie Mediaplayer 3" ) );
- setupActions();
- setupToolBar();
- setupMenu();
- m_stack = new OWidgetStack(this);
+ m_MainBox = new QWidget(this);
+
+ QVBoxLayout*m_l = new QVBoxLayout(m_MainBox);
+
+ m_stack = new OWidgetStack(m_MainBox);
m_stack->forceMode(Opie::Ui::OWidgetStack::SmallScreen);
- setCentralWidget(m_stack );
+ m_l->addWidget(m_stack);
+ m_scrollBar = new QSlider(QSlider::Horizontal,m_MainBox);
+ m_l->addWidget(m_scrollBar);
+ m_scrollBar->setEnabled(false);
+
m_playList = new PlaylistView(m_stack,"playlist");
m_stack->addWidget(m_playList,stack_list);
-
+ connect(m_playList,SIGNAL(contentChanged(int)),this,SLOT(slotListChanged(int)));
m_sfl = new OFileSelector("video/*;audio/*",m_stack);
@@ -85,2 +92,24 @@ PMainWindow::PMainWindow(QWidget*w, const char*name, WFlags f) m_LastItem = 0;
+ setupActions();
+ setupToolBar();
+ setupMenu();
+
+ setCentralWidget(m_MainBox );
+}
+
+void PMainWindow::slotListChanged(int count)
+{
+ if (!m_playList->isVisible()) {
+ return;
+ }
+ a_removeFiles->setEnabled(count>0);
+}
+
+void PMainWindow::mediaWindowraised()
+{
+ playlistOnly->setEnabled(false);
+ a_appendFiles->setEnabled(true);
+ a_loadPlaylist->setEnabled(true);
+ a_showPlaylist->setEnabled(true);
+ a_ShowMedia->setEnabled(false);
}
@@ -111,2 +140,10 @@ void PMainWindow::slotAppendFiles() m_stack->raiseWidget(m_sfl);
+ playlistOnly->setEnabled(false);
+
+ a_showPlaylist->setEnabled(true);
+ if (m_PlayLib && m_playing) {
+ a_ShowMedia->setEnabled(true);
+ } else {
+ a_ShowMedia->setEnabled(false);
+ }
}
@@ -116,5 +153,17 @@ void PMainWindow::slotShowList() m_stack->raiseWidget(m_playList);
+ playlistOnly->setEnabled(true);
+ a_showPlaylist->setEnabled(false);
+ if (m_playList->childCount()) {
+ a_removeFiles->setEnabled(true);
+ } else {
+ a_removeFiles->setEnabled(false);
+ }
+ if (m_PlayLib && m_playing) {
+ a_ShowMedia->setEnabled(true);
+ } else {
+ a_ShowMedia->setEnabled(false);
+ }
}
-void PMainWindow::slotPlayList()
+void PMainWindow::slotShowMediaWindow()
{
@@ -126,2 +175,11 @@ void PMainWindow::slotPlayList() }
+ mediaWindowraised();
+ return;
+ }
+}
+
+void PMainWindow::slotPlayList()
+{
+ if (m_playing && m_LastItem && m_PlayLib) {
+ slotShowMediaWindow();
return;
@@ -138,2 +196,27 @@ void PMainWindow::slotPlayList() +void PMainWindow::slotUserStop()
+{
+ if (!m_playing || !m_PlayLib) return;
+ m_playing = false;
+ m_PlayLib->stop();
+ m_scrollBar->setEnabled(false);
+ hideVideo();
+ slotShowList();
+}
+
+void PMainWindow::slotTogglePlay(bool how)
+{
+ if (how == m_playing) {
+ if (how) {
+ slotShowMediaWindow();
+ }
+ return;
+ }
+ if (how) {
+ slotPlayList();
+ } else {
+ slotUserStop();
+ }
+}
+
void PMainWindow::hideVideo()
@@ -141,3 +224,3 @@ void PMainWindow::hideVideo() if (m_VideoPlayer->isVisible() && a_ShowFull->isOn()) {
- m_VideoPlayer->showNormal();
+ //m_VideoPlayer->showNormal();
m_VideoPlayer->hide();
@@ -150,4 +233,6 @@ void PMainWindow::slotPlayCurrent() if (m_PlayLib) m_PlayLib->stop();
+ m_scrollBar->setEnabled(false);
+ a_playAction->setOn(false);
hideVideo();
- m_stack->raiseWidget(stack_list);
+ slotShowList();
return;
@@ -158,2 +243,3 @@ void PMainWindow::slotPlayCurrent() odebug << "Pos: " << m_PlayLib->currentTime() << oendl;
+ int result = 0;
if (!m_LastItem->isVideo()) {
@@ -161,11 +247,19 @@ void PMainWindow::slotPlayCurrent() m_playing = true;
- QTimer::singleShot( 500, this, SLOT( slotCheckPos() ) );
m_stack->raiseWidget(stack_audio);
- m_AudioPlayer->playFile(m_LastItem->Lnk(),m_PlayLib);
+ result = m_AudioPlayer->playFile(m_LastItem->Lnk(),m_PlayLib);
} else {
m_playing = true;
- QTimer::singleShot( 500, this, SLOT( slotCheckPos() ) );
setupVideo(a_ShowFull->isOn());
- m_VideoPlayer->playFile(m_LastItem->Lnk(),m_PlayLib);
+ result = m_VideoPlayer->playFile(m_LastItem->Lnk(),m_PlayLib);
+ }
+ if (result<0) {
+ // fehler
+ return;
}
+ mediaWindowraised();
+ odebug << "Range: " << result << oendl;
+ m_scrollBar->setRange(0,result);
+ m_scrollBar->setValue(0);
+ m_scrollBar->setEnabled(true);
+ QTimer::singleShot( 500, this, SLOT( slotCheckPos() ) );
}
@@ -194,11 +288,2 @@ void PMainWindow::slotPlayPrevious() -void PMainWindow::slotUserStop()
-{
- if (!m_playing || !m_PlayLib) return;
- m_playing = false;
- m_PlayLib->stop();
- hideVideo();
- m_stack->raiseWidget(stack_list);
-}
-
void PMainWindow::slotStopped()
@@ -213,3 +298,4 @@ void PMainWindow::slotCheckPos() if (!m_playing) return;
- emit sigPos(m_PlayLib->currentTime());
+ //emit sigPos(m_PlayLib->currentTime());
+ m_scrollBar->setValue(m_PlayLib->currentTime());
QTimer::singleShot( 1000, this, SLOT( slotCheckPos() ) );
@@ -219,5 +305,5 @@ void PMainWindow::slotRemoveFiles() {
- slotUserStop();
+ if (m_playing||!m_playList->isVisible()) return;
PlaylistItem* Item = m_playList->currentItem();
- m_stack->raiseWidget(stack_list);
+ slotShowList();
m_playList->removeFromList(Item);
@@ -227,6 +313,22 @@ void PMainWindow::setupActions() {
- a_appendFiles = new QAction(tr("Open file(s)"),Resource::loadIconSet( "opieplayer2/add_to_playlist" ), 0, 0, this, 0, false );
+ a_appendFiles = new QAction(tr("Append file(s)"),Resource::loadIconSet( "opieplayer2/add_to_playlist" ), 0, 0, this, 0, false );
connect(a_appendFiles,SIGNAL(activated()),this,SLOT(slotAppendFiles()));
+ a_addDir = new QAction(tr("Add directory"),Resource::loadIconSet("folder_open"),0,0,this,0,false);
+ connect(a_addDir,SIGNAL(activated()),m_playList,SLOT(slotAppendDir()));
+ a_loadPlaylist = new QAction(tr("Append .m3u playlist"),Resource::loadIconSet("opieplayer2/add_to_playlist"),0,0,this,0,false);
+ connect(a_loadPlaylist,SIGNAL(activated()),m_playList,SLOT(slotOpenM3u()));
+ a_savePlaylist = new QAction(tr("Save .m3u playlist"),Resource::loadIconSet("save"),0,0,this,0,false);
+ connect(a_savePlaylist,SIGNAL(activated()),m_playList,SLOT(slotSaveAsM3u()));
+
+ playlistOnly = new QActionGroup(this,"playlistgroup",false);
+ playlistOnly->insert(a_appendFiles);
+ playlistOnly->insert(a_addDir);
+ playlistOnly->insert(a_loadPlaylist);
+ playlistOnly->insert(a_savePlaylist);
+
a_showPlaylist = new QAction(tr("Show playlist"),Resource::loadIconSet( "txt" ), 0, 0, this, 0, false );
connect(a_showPlaylist,SIGNAL(activated()),this,SLOT(slotShowList()));
+ a_ShowMedia = new QAction(tr("Show media window"),Resource::loadIconSet("opieplayer2/musicfile"), 0, 0, this, 0, false );
+ connect(a_ShowMedia,SIGNAL(activated()),this,SLOT(slotShowMediaWindow()));
+
a_removeFiles = new QAction(tr("Remove file"),Resource::loadIconSet( "opieplayer2/remove_from_playlist" ), 0, 0, this, 0, false );
@@ -236,4 +338,6 @@ void PMainWindow::setupActions() - a_playAction = new QAction(tr("Play list"),Resource::loadIconSet( "opieplayer2/play" ), 0, 0, this, 0, false );
- connect(a_playAction,SIGNAL(activated()),this,SLOT(slotPlayList()));
+ a_playAction = new QAction(tr("Play list"),Resource::loadIconSet( "opieplayer2/play" ), 0, 0, this, 0, true);
+ a_playAction->setOn(false);
+ connect(a_playAction,SIGNAL(toggled(bool)),this,SLOT(slotTogglePlay(bool)));
+
a_playNext = new QAction(tr("Play next in list"),Resource::loadIconSet( "fastforward" ), 0, 0, this, 0, false );
@@ -244,4 +348,2 @@ void PMainWindow::setupActions() connect(a_ShowFull,SIGNAL(toggled(bool)),this,SLOT(slotToggleFull(bool)));
- a_stopPlay = new QAction(tr("Show videos fullscreen"),Resource::loadIconSet( "stop" ), 0, 0, this, 0, false );
- connect(a_stopPlay,SIGNAL(activated()),this,SLOT(slotUserStop()));
@@ -249,5 +351,8 @@ void PMainWindow::setupActions() playersGroup->insert(a_playAction);
- playersGroup->insert(a_stopPlay);
playersGroup->insert(a_playNext);
- //playersGroup->insert(a_ShowFull);
+
+ /* initial states of actions */
+ a_showPlaylist->setEnabled(false);
+ a_removeFiles->setEnabled(false);
+ a_ShowMedia->setEnabled(false);
}
@@ -265,2 +370,3 @@ void PMainWindow::setupToolBar() a_showPlaylist->addTo(m_toolBar);
+ a_ShowMedia->addTo(m_toolBar);
a_ShowFull->addTo(m_toolBar);
@@ -276,4 +382,6 @@ void PMainWindow::setupVideo(bool full) m_VideoPlayer->showFullScreen();
+ connect(m_VideoPlayer,SIGNAL(videoclicked()),this,SLOT(slotVideoclicked()));
} else {
m_VideoPlayer->hide();
+ m_VideoPlayer->disconnect(this);
m_stack->addWidget(m_VideoPlayer,stack_video);
@@ -281,5 +389,4 @@ void PMainWindow::setupVideo(bool full) }
+ mediaWindowraised();
m_VideoPlayer->fullScreen(full);
- m_VideoPlayer->disconnect(this);
- connect(m_VideoPlayer,SIGNAL(videoclicked()),this,SLOT(slotVideoclicked()));
}
@@ -310,2 +417,6 @@ void PMainWindow::setupMenu() a_removeFiles->addTo(fileMenu);
+ a_addDir->addTo(fileMenu);
+ fileMenu->insertSeparator();
+ a_loadPlaylist->addTo(fileMenu);
+ a_savePlaylist->addTo(fileMenu);
@@ -314,2 +425,3 @@ void PMainWindow::setupMenu() a_showPlaylist->addTo(dispMenu);
+ a_ShowMedia->addTo(dispMenu);
a_ShowFull->addTo(dispMenu);
diff --git a/noncore/multimedia/opieplayer3/mwindow.h b/noncore/multimedia/opieplayer3/mwindow.h index 28f820f..10c7a29 100644 --- a/noncore/multimedia/opieplayer3/mwindow.h +++ b/noncore/multimedia/opieplayer3/mwindow.h @@ -60,2 +60,3 @@ class VideoWidget; class PlaylistItem;
+class QSlider;
@@ -71,2 +72,4 @@ public slots: protected:
+
+ /* GUI parts */
static const int stack_list = 0;
@@ -80,6 +83,9 @@ protected: VideoWidget*m_VideoPlayer;
+ QWidget*m_MainBox;
+ QSlider*m_scrollBar;
- QAction*a_appendFiles,*a_removeFiles,*a_showPlaylist,*a_playAction,*a_deleteItem,*a_stopAction;
- QAction*a_playNext,*a_playPrevious,*a_ShowFull,*a_stopPlay;
- QActionGroup*playersGroup;
+ QAction*a_appendFiles,*a_removeFiles,*a_showPlaylist,*a_playAction,*a_stopAction;
+ QAction*a_playNext,*a_playPrevious,*a_ShowFull,*a_stopPlay,*a_ShowMedia;
+ QAction*a_addDir,*a_loadPlaylist,*a_savePlaylist;
+ QActionGroup*playersGroup,*playlistOnly;
QToolBar*m_toolBar;
@@ -99,2 +105,3 @@ protected: PlaylistItem*m_LastItem;
+ void mediaWindowraised();
@@ -114,2 +121,5 @@ protected slots: virtual void slotGoNext();
+ virtual void slotTogglePlay(bool);
+ virtual void slotShowMediaWindow();
+ virtual void slotListChanged(int);
diff --git a/noncore/multimedia/opieplayer3/opieplayer3.pro b/noncore/multimedia/opieplayer3/opieplayer3.pro index 1c7149f..a5d5def 100644 --- a/noncore/multimedia/opieplayer3/opieplayer3.pro +++ b/noncore/multimedia/opieplayer3/opieplayer3.pro @@ -2,3 +2,3 @@ CONFIG = qt warn_on quick-app HEADERS = mwindow.h playlist.h ../opieplayer2/lib.h ../opieplayer2/threadutil.h \ - ../opieplayer2/alphablend.h ../opieplayer2/yuv2rgb.h \ + ../opieplayer2/alphablend.h ../opieplayer2/yuv2rgb.h ../opieplayer2/om3u.h \ audiowidget.h ../opieplayer2/xinevideowidget.h \ @@ -6,3 +6,3 @@ HEADERS = mwindow.h playlist.h ../opieplayer2/lib.h ../opieplayer2/threadutil. SOURCES = mwindow.cpp playlist.cpp ../opieplayer2/lib.cpp ../opieplayer2/threadutil.cpp \ - ../opieplayer2/nullvideo.c \ + ../opieplayer2/nullvideo.c ../opieplayer2/om3u.cpp \ ../opieplayer2/alphablend.c ../opieplayer2/yuv2rgb.c \ diff --git a/noncore/multimedia/opieplayer3/playlist.cpp b/noncore/multimedia/opieplayer3/playlist.cpp index 272a71e..babe8ce 100644 --- a/noncore/multimedia/opieplayer3/playlist.cpp +++ b/noncore/multimedia/opieplayer3/playlist.cpp @@ -34,2 +34,3 @@ #include "../opieplayer2/lib.h"
+#include "../opieplayer2/om3u.h"
@@ -37,2 +38,3 @@ #include <opie2/oresource.h>
+#include <opie2/ofiledialog.h>
@@ -41,2 +43,7 @@ #include <qfileinfo.h>
+#include <qmessagebox.h>
+#include <qdir.h>
+
+//#define DEFAULT_FILE_TYPES "*.mp3;*.ogg;*.ogm;*.wma;*.wav;*.asf;*.au;*.avi;*.mpeg;*.mpg;*.mv1;*.mov;*.wmv;*.pls;*.m3u;*.mp4;*.m4a"
+#define DEFAULT_FILE_TYPES "*.mp3;*.ogg;*.ogm;*.wma;*.wav;*.asf;*.au;*.avi;*.mpeg;*.mpg;*.mv1;*.mov;*.wmv;*.mp4;*.m4a"
@@ -87,2 +94,3 @@ PlaylistView::PlaylistView(QWidget *parent, const char *name) m_lastItem = 0;
+ m_lastDir = QDir::homeDirPath();
}
@@ -104,20 +112,52 @@ void PlaylistView::slotAddFile(const DocLnk&aLink) {
- QFileInfo fileInfo(aLink.file());
+ addFile(aLink.file(),aLink.name());
+ emit contentChanged(childCount());
+}
+
+void PlaylistView::addFile(const QString&aFile,const QString&aName)
+{
+ QFileInfo fileInfo(aFile);
if (!fileInfo.exists()) return;
checkLib();
-
m_Infolib->stop();
- if (m_lastItem) {
- m_lastItem = new PlaylistItem(aLink,this,m_lastItem);
- } else {
- m_lastItem = new PlaylistItem(aLink,this);
+ QString name = aName;
+ if (name.isEmpty()) {
+ name = fileInfo.fileName();
}
- m_lastItem->setExpandable(false);
- m_lastItem->setText(1,aLink.name());
- int i = m_Infolib->setfile(aLink.file());
- odebug << "File set: " << i << oendl;
+ int i = m_Infolib->setfile(aFile.utf8().data());
+ odebug << "File set: " << i << " ("<<aFile.utf8().data()<<")"<<oendl;
if (i<1) {
+ i = m_Infolib->error();
+ odebug << "Errorcode: " << i << oendl;
+ QString msg;
+ msg = QString(tr("Error open file %1: ")).arg(name);
+ switch (i) {
+ case 1:
+ msg += tr("No input plugin");
+ break;
+ case 2:
+ msg += tr("No demuxer plugin");
+ break;
+ case 3:
+ msg += tr("Demuxer failed");
+ break;
+ case 4:
+ msg+=tr("Malformed mrl");
+ break;
+ default:
+ msg += tr("Unknown error");
+ break;
+ }
+ QMessageBox::warning(0,tr("Error reading fileheader"),msg);
return;
}
+ m_lastItem = m_items.last();
+ if (m_lastItem) {
+ m_lastItem = new PlaylistItem(aFile,this,m_lastItem);
+ } else {
+ m_lastItem = new PlaylistItem(aFile,this);
+ }
+ m_lastItem->setExpandable(false);
+ m_lastItem->setText(1,name);
@@ -156,2 +196,61 @@ void PlaylistView::slotAddFile(const DocLnk&aLink) m_items.append(m_lastItem);
+ setSelected(m_lastItem,true);
+}
+
+void PlaylistView::slotAppendDir()
+{
+ QString _dir = Opie::Ui::OFileDialog::getDirectory(Opie::Ui::OFileSelector::Extended,m_lastDir,0,m_lastDir);
+ if (_dir.isEmpty()) return;
+ m_lastDir = _dir;
+ QDir sDir(_dir);
+ QStringList list = sDir.entryList(DEFAULT_FILE_TYPES,QDir::Files,QDir::Name | QDir::IgnoreCase);
+ for (unsigned i = 0; i < list.count();++i) {
+ addFile(_dir+QString("/")+list[i]);
+ }
+ emit contentChanged(childCount());
+}
+
+void PlaylistView::slotOpenM3u()
+{
+ QStringList types;
+ QMap<QString, QStringList> mimeTypes;
+ types << "audio/x-mpegurl";
+ mimeTypes.insert("Playlists",types);
+ mimeTypes.insert("All",types);
+ QString fileName= Opie::Ui::OFileDialog::getOpenFileName(Opie::Ui::OFileSelector::EXTENDED,
+ m_lastDir,"playlist.m3u", mimeTypes);
+ if (fileName.isEmpty()) {
+ return;
+ }
+ QFileInfo f(fileName);
+
+ Om3u _om3u(fileName, IO_ReadOnly);
+ if (f.extension(FALSE).lower()=="m3u") {
+ _om3u.readM3u();
+ } else if (f.extension(FALSE).lower()=="pls") {
+ _om3u.readPls();
+ }
+ for (unsigned int j=0; j<_om3u.count();++j) {
+ addFile(_om3u[j]);
+ }
+ emit contentChanged(childCount());
+}
+
+void PlaylistView::slotSaveAsM3u()
+{
+ QStringList types;
+ QMap<QString, QStringList> mimeTypes;
+ types << "audio/x-mpegurl";
+ mimeTypes.insert("Playlists",types);
+ mimeTypes.insert("All",types);
+ QString fileName= Opie::Ui::OFileDialog::getSaveFileName(Opie::Ui::OFileSelector::EXTENDED,
+ m_lastDir,"playlist.m3u", mimeTypes);
+ if (fileName.isEmpty()) {
+ return;
+ }
+ Om3u _om3u(fileName, IO_ReadWrite | IO_Truncate);
+ for (unsigned j=0; j<m_items.count();++j) {
+ _om3u.add(m_items[j]->Lnk().file());
+ }
+ _om3u.write();
}
@@ -161,5 +260,8 @@ void PlaylistView::removeFromList(PlaylistItem*Item) if (!Item)return;
- t_itemlist::Iterator iter;
+ t_itemlist::Iterator iter,it2;
iter = m_items.find(Item);
+ it2 = m_items.end();
if (iter!=m_items.end()) {
+ it2 = iter;
+ ++it2;
m_items.remove(iter);
@@ -167,2 +269,9 @@ void PlaylistView::removeFromList(PlaylistItem*Item) delete Item;
+ if (it2!=m_items.end()) {
+ setSelected((*it2),true);
+ } else if (m_items.count()) {
+ QListViewItem * it = m_items.last();
+ setSelected(it,true);
+ }
+ emit contentChanged(childCount());
}
diff --git a/noncore/multimedia/opieplayer3/playlist.h b/noncore/multimedia/opieplayer3/playlist.h index ad4c472..4a9268c 100644 --- a/noncore/multimedia/opieplayer3/playlist.h +++ b/noncore/multimedia/opieplayer3/playlist.h @@ -88,4 +88,11 @@ public: };
+ void addFile(const QString&aFile,const QString&aName="");
+signals:
+ void contentChanged(int);
+
public slots:
virtual void slotAddFile(const DocLnk&);
+ virtual void slotAppendDir();
+ virtual void slotOpenM3u();
+ virtual void slotSaveAsM3u();
@@ -97,2 +104,3 @@ protected: t_itemlist m_items;
+ QString m_lastDir;
};
diff --git a/noncore/multimedia/opieplayer3/videowidget.cpp b/noncore/multimedia/opieplayer3/videowidget.cpp index c5c63c7..a28d47d 100644 --- a/noncore/multimedia/opieplayer3/videowidget.cpp +++ b/noncore/multimedia/opieplayer3/videowidget.cpp @@ -21,2 +21,3 @@ VideoWidget::VideoWidget( QWidget * parent, const char * name, WFlags f) m_Videodisplay = new XineVideoWidget(this,"videodisp");
+#if 0
m_PosSlider = new QSlider(QSlider::Horizontal,this);
@@ -27,6 +28,9 @@ VideoWidget::VideoWidget( QWidget * parent, const char * name, WFlags f) connect(m_PosSlider,SIGNAL(sliderReleased()),this,SLOT(sliderReleased()));
+#endif
connect(m_Videodisplay,SIGNAL(videoResized ( const QSize & )),this,SLOT(slot_Videoresized(const QSize&)));
connect(m_Videodisplay,SIGNAL(clicked()),this,SLOT(slotClicked()));
+#if 0
m_pressed = false;
m_uppos=0;
+#endif
}
@@ -47,4 +51,5 @@ void VideoWidget::closeEvent(QCloseEvent*e) -void VideoWidget::slotNewPos(int pos)
+void VideoWidget::slotNewPos(int /*pos*/)
{
+#if 0
if (!m_xineLib) return;
@@ -52,2 +57,3 @@ void VideoWidget::slotNewPos(int pos) m_xineLib->seekTo(pos);
+#endif
}
@@ -56,3 +62,5 @@ void VideoWidget::sliderPressed() {
+#if 0
m_pressed = true;
+#endif
}
@@ -61,7 +69,10 @@ void VideoWidget::sliderReleased() {
+#if 0
m_pressed = false;
+#endif
}
-void VideoWidget::fullScreen(bool how)
+void VideoWidget::fullScreen(bool /* how */)
{
+#if 0
if (how) {
@@ -71,9 +82,11 @@ void VideoWidget::fullScreen(bool how) }
+#endif
}
-void VideoWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib)
+int VideoWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib)
{
m_current = aLnk;
+ bool recon;
if (m_xineLib != aLib) {
- disconnect(m_xineLib);
+ if (m_xineLib) disconnect(m_xineLib);
m_xineLib = aLib;
@@ -82,7 +95,9 @@ void VideoWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib) if (!m_xineLib) {
- return;
+ return -1;
}
connect(m_xineLib,SIGNAL(stopped()),this,SLOT(slotStopped()));
+#if 0
m_uppos=0;
m_PosSlider->setValue(0);
+#endif
m_xineLib->setWidget(m_Videodisplay);
@@ -90,6 +105,12 @@ void VideoWidget::playFile(const DocLnk&aLnk,XINE::Lib*aLib) m_xineLib->resize(m_Videodisplay->size());
- m_xineLib->play(m_current.file());
- int l = m_xineLib->length();
+ int res = m_xineLib->play(m_current.file());
+ odebug << "Xine play: " << res << oendl;
+ if (res != 1) {
+ return -2;
+ }
+ return m_xineLib->length();
+#if 0
m_PosSlider->setRange(0,l);
m_PosSlider->setPageStep(l/10);
+#endif
}
@@ -116,4 +137,5 @@ void VideoWidget::slot_Videoresized(const QSize&s) -void VideoWidget::updatePos(int val)
+void VideoWidget::updatePos(int /*val*/)
{
+#if 0
if (m_pressed) return;
@@ -121,2 +143,3 @@ void VideoWidget::updatePos(int val) m_PosSlider->setValue(val);
+#endif
}
diff --git a/noncore/multimedia/opieplayer3/videowidget.h b/noncore/multimedia/opieplayer3/videowidget.h index f181980..935a648 100644 --- a/noncore/multimedia/opieplayer3/videowidget.h +++ b/noncore/multimedia/opieplayer3/videowidget.h @@ -22,3 +22,3 @@ public: - void playFile(const DocLnk&,XINE::Lib*);
+ int playFile(const DocLnk&,XINE::Lib*);
void fullScreen(bool how);
@@ -38,2 +38,3 @@ protected: QWidget * m_holder;
+#if 0
QSlider*m_PosSlider;
@@ -41,2 +42,3 @@ protected: int m_uppos;
+#endif
|