summaryrefslogtreecommitdiff
Side-by-side diff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/multimedia/opieplayer2/mediadetect.cpp38
-rw-r--r--noncore/multimedia/opieplayer2/mediadetect.h31
-rw-r--r--noncore/multimedia/opieplayer2/opieplayer2.pro4
-rw-r--r--noncore/multimedia/opieplayer2/playlistwidget.cpp229
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp20
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.h2
6 files changed, 136 insertions, 188 deletions
diff --git a/noncore/multimedia/opieplayer2/mediadetect.cpp b/noncore/multimedia/opieplayer2/mediadetect.cpp
new file mode 100644
index 0000000..7deeb2f
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/mediadetect.cpp
@@ -0,0 +1,38 @@
+#include <qstring.h>
+#include "mediadetect.h"
+
+
+MediaDetect::MediaDetect() {
+}
+
+MediaDetect::~MediaDetect() {
+}
+
+char MediaDetect::videoOrAudio( const QString& fileName ) {
+ if( fileName.right(4) == ".avi" ||
+ fileName.right(4) == ".mpg" ||
+ fileName.right(4) == ".asf" ||
+ fileName.right(4) == ".mov" ||
+ fileName.right(5) == ".mpeg" ) {
+ return 'v';
+ } else if ( fileName.right(4) == ".avi" ||
+ fileName.right(4) == ".mp3" ||
+ fileName.right(4) == ".ogg" ||
+ fileName.right(4) == ".wav" ) {
+ return 'a';
+ } else {
+ return 'f';
+ }
+}
+
+bool MediaDetect::isStreaming( const QString& fileName ) {
+ // ugly
+ if( fileName.left(4) == "http" ) {
+ return true;
+ } else if (fileName.left(3) == "ftp" ) {
+ return true;
+ } else {
+ return false;
+ }
+}
+
diff --git a/noncore/multimedia/opieplayer2/mediadetect.h b/noncore/multimedia/opieplayer2/mediadetect.h
new file mode 100644
index 0000000..bd5ea1d
--- a/dev/null
+++ b/noncore/multimedia/opieplayer2/mediadetect.h
@@ -0,0 +1,31 @@
+
+#ifndef MEDIADETECT_H
+#define MEDIADETECT_H
+
+
+class QString;
+class MediaDetect {
+
+public:
+ MediaDetect();
+ ~MediaDetect();
+
+ /**
+ * Look at the filename and decide which gui is to be used
+ *
+ * @param filename the filename
+ * @return the char - a for audio gui, v for video, f for error
+ */
+ char videoOrAudio( const QString& fileName );
+
+ /**
+ * Find out if it is a streaming media file
+ *
+ * @param filename the filename
+ * @return if it is a streaming url or not
+ */
+ bool isStreaming( const QString& fileName );
+
+};
+
+#endif
diff --git a/noncore/multimedia/opieplayer2/opieplayer2.pro b/noncore/multimedia/opieplayer2/opieplayer2.pro
index bcd9b92..37208ef 100644
--- a/noncore/multimedia/opieplayer2/opieplayer2.pro
+++ b/noncore/multimedia/opieplayer2/opieplayer2.pro
@@ -2,11 +2,11 @@ TEMPLATE = app
CONFIG = qt warn_on release
#release
DESTDIR = $(OPIEDIR)/bin
-HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h\
+HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h mediadetect.h\
videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \
frame.h lib.h
SOURCES = main.cpp \
- playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp\
+ playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp mediadetect.cpp\
videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \
frame.cpp lib.cpp nullvideo.c
TARGET = opieplayer
diff --git a/noncore/multimedia/opieplayer2/playlistwidget.cpp b/noncore/multimedia/opieplayer2/playlistwidget.cpp
index 0390c99..9373f6b 100644
--- a/noncore/multimedia/opieplayer2/playlistwidget.cpp
+++ b/noncore/multimedia/opieplayer2/playlistwidget.cpp
@@ -34,7 +34,6 @@
#include <qregexp.h>
#include <qtextstream.h>
-//#include <qtimer.h>
#include "playlistselection.h"
#include "playlistwidget.h"
@@ -61,13 +60,9 @@
#define SIDE_BUTTONS
#define CAN_SAVE_LOAD_PLAYLISTS
-extern AudioWidget *audioUI;
-extern VideoWidget *videoUI;
extern MediaPlayerState *mediaPlayerState;
-// class myFileSelector {
-// };
class PlayListWidgetPrivate {
public:
QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
@@ -114,8 +109,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
insanityBool=FALSE;
audioScan = FALSE;
videoScan = FALSE;
-// menuTimer = new QTimer( this ,"menu timer"),
-// connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
setBackgroundMode( PaletteButton );
@@ -134,8 +127,7 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
QPEToolBar *bar = new QPEToolBar( this );
bar->setLabel( tr( "Play Operations" ) );
-// d->tbPlayCurList = new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list",
-// this , SLOT( addSelected()) );
+
tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close");
tbDeletePlaylist->setFlat(TRUE);
tbDeletePlaylist->setFixedSize(20,20);
@@ -144,7 +136,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
this , SLOT(addSelected()) );
d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist",
this , SLOT(removeSelected()) );
-// d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play", /*this */mediaPlayerState , SLOT(setPlaying(bool) /* btnPlay() */), TRUE );
d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play",
this , SLOT( btnPlay(bool) ), TRUE );
d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer/shuffle",
@@ -186,8 +177,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
QWidget *pTab;
pTab = new QWidget( tabWidget, "pTab" );
-// playlistView = new QListView( pTab, "playlistview" );
-// playlistView->setMinimumSize(236,260);
tabWidget->insertTab( pTab,"Playlist");
@@ -204,8 +193,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold);
-
-
QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) );
new ToolButton( vbox1, tr( "Remove" ), "opieplayer/cut", d->selectedFiles, SLOT(removeSelected()) );
@@ -230,10 +217,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
-// audioView
-// populateAudioView();
-// videowidget
-
QWidget *vTab;
vTab = new QWidget( tabWidget, "vTab" );
videoView = new QListView( vTab, "Videoview" );
@@ -251,7 +234,6 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
tabWidget->insertTab( vTab,tr("Video"));
-// populateVideoView();
//playlists list
QWidget *LTab;
@@ -260,56 +242,34 @@ PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
playLists->setMinimumSize(233,260);
tabWidget->insertTab(LTab,tr("Lists"));
-// connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
-
-// add the library area
-
-// connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
-// this, SLOT( fauxPlay( QListViewItem *) ) );
-// connect( videoView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
-// this, SLOT( fauxPlay( QListViewItem *)) );
-
-// connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
-// connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
-
connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) );
connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) );
connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) );
-
connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
-
connect( audioView, SIGNAL( returnPressed( QListViewItem *)),
this,SLOT( playIt( QListViewItem *)) );
connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
-
connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
connect( videoView, SIGNAL( returnPressed( QListViewItem *)),
this,SLOT( playIt( QListViewItem *)) );
connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
-
connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
-
-
connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
-
connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) );
connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) );
connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) );
connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) );
-
connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
-// connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
setCentralWidget( vbox5 );
Config cfg( "OpiePlayer" );
readConfig( cfg );
QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
-// qDebug("currentList is "+currentPlaylist);
loadList(DocLnk( currentPlaylist));
setCaption(tr("OpiePlayer: ")+ currentPlaylist );
@@ -321,9 +281,9 @@ PlayListWidget::~PlayListWidget() {
Config cfg( "OpiePlayer" );
writeConfig( cfg );
-
- if ( d->current )
+ if ( d->current ) {
delete d->current;
+ }
delete d;
}
@@ -333,13 +293,7 @@ void PlayListWidget::initializeStates() {
d->tbPlay->setOn( mediaPlayerState->playing() );
d->tbLoop->setOn( mediaPlayerState->looping() );
d->tbShuffle->setOn( mediaPlayerState->shuffled() );
-// d->tbFull->setOn( mediaPlayerState->fullscreen() );
-// d->tbScale->setOn( mediaPlayerState->scaled() );
-// d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
-// setPlaylist( mediaPlayerState->playlist() );
setPlaylist( true);
-// d->selectedFiles->first();
-
}
@@ -357,7 +311,6 @@ void PlayListWidget::readConfig( Config& cfg ) {
}
}
d->selectedFiles->setSelectedItem( currentString);
-// d->selectedFiles->setSelectedItem( (const QString &)currentString);
}
@@ -372,7 +325,6 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
if ( lnk ) {
QString entryName;
entryName.sprintf( "File%i", noOfFiles + 1 );
-// qDebug(entryName);
cfg.writeEntry( entryName, lnk->linkFile() );
// if this link does exist, add it so we have the file
// next time...
@@ -398,12 +350,6 @@ void PlayListWidget::writeConfig( Config& cfg ) const {
void PlayListWidget::addToSelection( const DocLnk& lnk ) {
-// qDebug("add");
-// if( lnk.file().find(" ",0,TRUE) != -1 || lnk.file().find("%20",0,TRUE) != -1) {
-// QMessageBox::message("Note","You are trying to play\na malformed url.");
-
-// } else {
-
d->setDocumentUsed = FALSE;
if ( mediaPlayerState->playlist() ) {
if(QFileInfo(lnk.file()).exists() || lnk.file().left(4) == "http" )
@@ -411,32 +357,36 @@ void PlayListWidget::addToSelection( const DocLnk& lnk ) {
}
else
mediaPlayerState->setPlaying( TRUE );
-// }
}
void PlayListWidget::clearList() {
- while ( first() )
+ while ( first() ) {
d->selectedFiles->removeSelected();
}
+}
void PlayListWidget::addAllToList() {
DocLnkSet filesAll;
Global::findDocuments(&filesAll, "video/*;audio/*");
QListIterator<DocLnk> Adit( filesAll.children() );
- for ( ; Adit.current(); ++Adit )
- if(QFileInfo(Adit.current()->file()).exists())
+ for ( ; Adit.current(); ++Adit ) {
+ if(QFileInfo(Adit.current()->file()).exists()) {
d->selectedFiles->addToSelection( **Adit );
}
+ }
+}
void PlayListWidget::addAllMusicToList() {
QListIterator<DocLnk> dit( files.children() );
- for ( ; dit.current(); ++dit )
- if(QFileInfo(dit.current()->file()).exists())
+ for ( ; dit.current(); ++dit ) {
+ if(QFileInfo(dit.current()->file()).exists()) {
d->selectedFiles->addToSelection( **dit );
}
+ }
+}
void PlayListWidget::addAllVideoToList() {
@@ -454,14 +404,12 @@ void PlayListWidget::setDocument(const QString& fileref) {
QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
return;
}
-// qDebug("setDocument "+fileref);
+
if(fileref.find("m3u",0,TRUE) != -1) { //is m3u
readm3u( fileref);
- }
- else if(fileref.find("pls",0,TRUE) != -1) { //is pls
+ } else if(fileref.find("pls",0,TRUE) != -1) { //is pls
readPls( fileref);
- }
- else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist
+ } else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist
clearList();
loadList(DocLnk(fileref));
d->selectedFiles->first();
@@ -493,28 +441,13 @@ void PlayListWidget::useSelectedDocument() {
const DocLnk *PlayListWidget::current() { // this is fugly
-// if( fromSetDocument) {
-// qDebug("from setDoc");
-// DocLnkSet files;
-// Global::findDocuments(&files, "video/*;audio/*");
-// QListIterator<DocLnk> dit( files.children() );
-// for ( ; dit.current(); ++dit ) {
-// if(dit.current()->linkFile() == setDocFileRef) {
-// qDebug(setDocFileRef);
-// return dit;
-// }
-// }
-// } else
-
-
switch (tabWidget->currentPageIndex()) {
case 0: //playlist
{
qDebug("playlist");
if ( mediaPlayerState->playlist() ) {
return d->selectedFiles->current();
- }
- else if ( d->setDocumentUsed && d->current ) {
+ } else if ( d->setDocumentUsed && d->current ) {
return d->current;
} else {
return d->files->selected();
@@ -630,22 +563,23 @@ void PlayListWidget::saveList() {
writeConfig( cfg );
DocLnk lnk;
-// lnk.setComment( "");
lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property
lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
lnk.setIcon("opieplayer/playlist2");
lnk.setName( filename); //sets file name
// qDebug(filename);
- if(!lnk.writeLink())
+ if(!lnk.writeLink()) {
qDebug("Writing doclink did not work");
}
+ }
Config config( "OpiePlayer" );
config.writeEntry("CurrentPlaylist",filename);
setCaption(tr("OpiePlayer: ")+filename);
d->selectedFiles->first();
- if(fileDlg)
+ if(fileDlg) {
delete fileDlg;
}
+}
void PlayListWidget::loadList( const DocLnk & lnk) {
QString name= lnk.name();
@@ -667,11 +601,12 @@ void PlayListWidget::loadList( const DocLnk & lnk) {
}
void PlayListWidget::setPlaylist( bool shown ) {
- if ( shown )
+ if ( shown ) {
d->playListFrame->show();
- else
+ } else {
d->playListFrame->hide();
}
+}
void PlayListWidget::setView( char view ) {
if ( view == 'l' )
@@ -691,9 +626,6 @@ void PlayListWidget::addSelected() {
case 0: //playlist
break;
case 1: { //audio
-// QString entryName;
-// entryName.sprintf( "File%i", i + 1 );
-// QString linkFile = cfg.readEntry( entryName );
QListViewItemIterator it( audioView );
// iterate through all items of the listview
for ( ; it.current(); ++it ) {
@@ -721,23 +653,9 @@ void PlayListWidget::addSelected() {
d->selectedFiles->addToSelection( **dit );
}
}
-
videoView->setSelected( it.current(),FALSE);
}
}
-// for ( int i = 0; i < noOfFiles; i++ ) {
-// QString entryName;
-// entryName.sprintf( "File%i", i + 1 );
-// QString linkFile = cfg.readEntry( entryName );
-// if( DocLnk( linkFile).name() == videoView->selectedItem()->text(0) ) {
-// int result= QMessageBox::warning(this,tr("OpiePlayer"),
-// tr("This is all ready in your playlist.\nContinue?"),
-// tr("Yes"),tr("No"),0,0,1);
-// if (result !=0)
-// return;
-// }
-// }
-// addToSelection( videoView->selectedItem() );
tabWidget->setCurrentPage(0);
}
break;
@@ -749,8 +667,6 @@ void PlayListWidget::removeSelected() {
}
void PlayListWidget::playIt( QListViewItem *it) {
-// d->setDocumentUsed = FALSE;
-// mediaPlayerState->curPosition =0;
qDebug("playIt");
mediaPlayerState->setPlaying(FALSE);
mediaPlayerState->setPlaying(TRUE);
@@ -835,12 +751,7 @@ void PlayListWidget::btnPlay(bool b) {
switch ( tabWidget->currentPageIndex()) {
case 0:
{
-// if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
-// if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
-// QMessageBox::message("Note","You are trying to play\na malformed url.");
-// } else {
mediaPlayerState->setPlaying(b);
-// }
}
break;
case 1:
@@ -882,49 +793,40 @@ void PlayListWidget::deletePlaylist() {
};
}
-void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
-{
+void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) {
switch (mouse) {
case 1:
break;
case 2:{
-
QPopupMenu m;
m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
m.insertSeparator();
- if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() )
m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
-
m.exec( QCursor::pos() );
}
break;
};
}
-void PlayListWidget::playSelected()
-{
+void PlayListWidget::playSelected() {
btnPlay( TRUE);
-// d->selectedFiles->unSelect();
}
-void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i)
-{
+void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) {
switch (mouse) {
case 1:
break;
- case 2:{
+ case 2:
+ {
QPopupMenu m;
m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
-// m.insertSeparator();
-// m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
m.exec( QCursor::pos() );
}
break;
};
-
}
void PlayListWidget::listDelete() {
@@ -939,14 +841,11 @@ void PlayListWidget::listDelete() {
case 1:
{
file = audioView->selectedItem()->text(0);
-// Global::findDocuments(&files, "audio/*");
-// AppLnkSet appFiles;
QListIterator<DocLnk> dit( files.children() );
for ( ; dit.current(); ++dit ) {
if( dit.current()->name() == file) {
// qDebug(file);
LnkProperties prop( dit.current() );
-// connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
prop.showMaximized();
prop.exec();
}
@@ -956,19 +855,7 @@ void PlayListWidget::listDelete() {
break;
case 2:
{
-// file = videoView->selectedItem()->text(0);
-// for ( int i = 0; i < noOfFiles; i++ ) {
-// QString entryName;
-// entryName.sprintf( "File%i", i + 1 );
-// QString linkFile = cfg.readEntry( entryName );
-// AppLnk lnk( AppLnk(linkFile));
-// if( lnk.name() == file ) {
-// LnkProperties prop( &lnk);
-// // connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
-// prop.showMaximized();
-// prop.exec();
-// }
-// }
+
}
break;
};
@@ -1058,41 +945,36 @@ void PlayListWidget::openFile() {
fileDlg->exec();
if( fileDlg->result() == 1 ) {
filename = fileDlg->LineEdit1->text();
-// http://205.188.234.129:8030
-// http://66.28.68.70:8000
-// filename.replace(QRegExp("%20")," ");
- if(filename.find(" ",0,TRUE) != -1 || filename.find("%20",0,TRUE) != -1) {
- QMessageBox::message("Note","Spaces in urls are not allowed.");
- return;
- } else {
+
qDebug("Selected filename is "+filename);
- if(filename.right(3) == "m3u")
+ if(filename.right(3) == "m3u") {
readm3u( filename);
- else if(filename.right(3) == "pls")
+ } else if(filename.right(3) == "pls") {
readPls( filename);
- else {
+ } else {
DocLnk lnk;
lnk.setName(filename); //sets file name
- if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3")
+ // probably not needed anymore either
+ if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3") {
filename += "/";
+ }
lnk.setFile(filename); //sets File property
lnk.setType("audio/x-mpegurl");
lnk.setExec("opieplayer");
lnk.setIcon("opieplayer/MPEGPlayer");
- if(!lnk.writeLink())
+ if(!lnk.writeLink()) {
qDebug("Writing doclink did not work");
- d->selectedFiles->addToSelection( lnk);
-// if(fileDlg2)
-// delete fileDlg2;
}
+ d->selectedFiles->addToSelection( lnk);
}
}
- if(fileDlg)
+ if(fileDlg) {
delete fileDlg;
}
+}
void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
{
@@ -1210,12 +1092,9 @@ void PlayListWidget::readm3u(const QString &filename) {
QString s;//, first, second;
int i=0;
while ( !t.atEnd()) {
-// Lview->insertLine(t.readLine(),-1);
s=t.readLine();
- if(s.find(" ",0,TRUE) != -1 || s.find("%20",0,TRUE) != -1) {
- QMessageBox::message("Note","Spaces in urls are not allowed.");
- }
- else if(s.find("#",0,TRUE) == -1) {
+
+ if(s.find("#",0,TRUE) == -1) {
if(s.find(" ",0,TRUE) == -1) { // not sure if this is neede since cf uses vfat
if(s.left(2) == "E:" || s.left(2) == "P:") {
s=s.right(s.length()-2);
@@ -1227,30 +1106,25 @@ void PlayListWidget::readm3u(const QString &filename) {
s=s.replace( QRegExp("\\"),"/");
lnk.setFile( s);
lnk.writeLink();
-// lnk.setIcon(opieplayer/MPEGPlayer);
qDebug("add "+name);
d->selectedFiles->addToSelection( lnk);
} else { // is url
-
s.replace(QRegExp("%20")," ");
DocLnk lnk( s);
QString name;
- if(name.left(4)=="http")
+ if(name.left(4)=="http") {
name = s.right( s.length() - 7);
- else
+ } else {
name=s;
-// name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
+ }
lnk.setName(name);
- if(s.at(s.length()-4) == '.')
+ if(s.at(s.length()-4) == '.') {
lnk.setFile( s);
- else
+ } else {
lnk.setFile( s+"/");
-// lnk.setFile( filename);
-// lnk.setComment( s+"/");
+ }
lnk.setType("audio/x-mpegurl");
lnk.writeLink();
-// lnk.setIcon( "opieplayer/MPEGPlayer");
-// qDebug("add "+s);
d->selectedFiles->addToSelection( lnk);
}
i++;
@@ -1314,7 +1188,6 @@ void PlayListWidget::readPls(const QString &filename) {
// Length
// Version
// File2=http
-
s=s.replace( QRegExp("\\"),"/");
DocLnk lnk( s );
QFileInfo f(s);
@@ -1324,10 +1197,6 @@ void PlayListWidget::readPls(const QString &filename) {
else
name=s;
name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
-// QFileInfo f(s);
-// QString name = f.baseName();
-// name = name.left(name.length()-4);
-// name = name.right(name.findRev("/",0,TRUE));
lnk.setName( name);
if(s.at(s.length()-4) == '.') // if this is probably a file
lnk.setFile( s);
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.cpp b/noncore/multimedia/opieplayer2/xinecontrol.cpp
index 5b674f8..7407e4e 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.cpp
+++ b/noncore/multimedia/opieplayer2/xinecontrol.cpp
@@ -2,6 +2,7 @@
#include "xinecontrol.h"
#include "mediaplayerstate.h"
+
extern MediaPlayerState *mediaPlayerState;
XineControl::XineControl( QObject *parent, const char *name )
@@ -22,16 +23,24 @@ void XineControl::play( const QString& fileName ) {
libXine->play( fileName );
mediaPlayerState->setPlaying( true );
// default to audio view until we know how to handle video
- mediaPlayerState->setView('a');
- // determines of slider is shown
- // mediaPlayerState->setIsStreaming( false );
- // hier dann schaun welcher view
+ // MediaDetect mdetect;
+ char whichGui = mdetect.videoOrAudio( fileName );
+ if (whichGui == 'f') {
+ qDebug("Nicht erkannter Dateityp");
+ return;
+ }
+
+ // which gui (video / audio)
+ mediaPlayerState->setView( whichGui );
+
+ // determine if slider is shown
+ mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) );
}
void XineControl::stop( bool isSet ) {
if ( !isSet) {
libXine->stop();
- mediaPlayerState->setNext();
+ mediaPlayerState->setList();
//mediaPlayerState->setPlaying( false );
} else {
// play again
@@ -39,7 +48,6 @@ void XineControl::stop( bool isSet ) {
}
void XineControl::pause( bool isSet) {
-
libXine->pause();
}
diff --git a/noncore/multimedia/opieplayer2/xinecontrol.h b/noncore/multimedia/opieplayer2/xinecontrol.h
index e45f1df..aab00cd 100644
--- a/noncore/multimedia/opieplayer2/xinecontrol.h
+++ b/noncore/multimedia/opieplayer2/xinecontrol.h
@@ -3,6 +3,7 @@
#define XINECONTROL_H
#include "lib.h"
+#include "mediadetect.h"
#include <qobject.h>
class XineControl : public QObject {
@@ -25,6 +26,7 @@ public slots:
private:
XINE::Lib *libXine;
+ MediaDetect mdetect;
int m_length;
int m_currentTime;
int m_position;