summaryrefslogtreecommitdiff
authorharlekin <harlekin>2002-07-09 12:33:52 (UTC)
committer harlekin <harlekin>2002-07-09 12:33:52 (UTC)
commit2fa8959b269c51bb40d1f03bbd7c55fdaa9da0dd (patch) (unidiff)
tree8ce99f4cde91c9346a4cd6f7029ec1d1308cfb30
parentc0d304c69f6c42328472cd1328d9cad7c2ed4dfb (diff)
downloadopie-2fa8959b269c51bb40d1f03bbd7c55fdaa9da0dd.zip
opie-2fa8959b269c51bb40d1f03bbd7c55fdaa9da0dd.tar.gz
opie-2fa8959b269c51bb40d1f03bbd7c55fdaa9da0dd.tar.bz2
more gui work
Diffstat (more/less context) (ignore 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.cpp357
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.cpp20
-rw-r--r--noncore/multimedia/opieplayer2/xinecontrol.h2
6 files changed, 200 insertions, 252 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 @@
1#include <qstring.h>
2#include "mediadetect.h"
3
4
5MediaDetect::MediaDetect() {
6}
7
8MediaDetect::~MediaDetect() {
9}
10
11char MediaDetect::videoOrAudio( const QString& fileName ) {
12 if( fileName.right(4) == ".avi" ||
13 fileName.right(4) == ".mpg" ||
14 fileName.right(4) == ".asf" ||
15 fileName.right(4) == ".mov" ||
16 fileName.right(5) == ".mpeg" ) {
17 return 'v';
18 } else if ( fileName.right(4) == ".avi" ||
19 fileName.right(4) == ".mp3" ||
20 fileName.right(4) == ".ogg" ||
21 fileName.right(4) == ".wav" ) {
22 return 'a';
23 } else {
24 return 'f';
25 }
26}
27
28bool MediaDetect::isStreaming( const QString& fileName ) {
29 // ugly
30 if( fileName.left(4) == "http" ) {
31 return true;
32 } else if (fileName.left(3) == "ftp" ) {
33 return true;
34 } else {
35 return false;
36 }
37}
38
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 @@
1
2#ifndef MEDIADETECT_H
3#define MEDIADETECT_H
4
5
6class QString;
7class MediaDetect {
8
9public:
10 MediaDetect();
11 ~MediaDetect();
12
13 /**
14 * Look at the filename and decide which gui is to be used
15 *
16 * @param filename the filename
17 * @return the char - a for audio gui, v for video, f for error
18 */
19 char videoOrAudio( const QString& fileName );
20
21 /**
22 * Find out if it is a streaming media file
23 *
24 * @param filename the filename
25 * @return if it is a streaming url or not
26 */
27 bool isStreaming( const QString& fileName );
28
29};
30
31#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
@@ -1,19 +1,19 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on release 2CONFIG = qt warn_on release
3#release 3#release
4DESTDIR = $(OPIEDIR)/bin 4DESTDIR = $(OPIEDIR)/bin
5HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h\ 5HEADERS = playlistselection.h mediaplayerstate.h xinecontrol.h mediadetect.h\
6 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \ 6 videowidget.h audiowidget.h playlistwidget.h mediaplayer.h inputDialog.h \
7 frame.h lib.h 7 frame.h lib.h
8SOURCES = main.cpp \ 8SOURCES = main.cpp \
9 playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp\ 9 playlistselection.cpp mediaplayerstate.cpp xinecontrol.cpp mediadetect.cpp\
10 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \ 10 videowidget.cpp audiowidget.cpp playlistwidget.cpp mediaplayer.cpp inputDialog.cpp \
11 frame.cpp lib.cpp nullvideo.c 11 frame.cpp lib.cpp nullvideo.c
12TARGET = opieplayer 12TARGET = opieplayer
13INCLUDEPATH += $(OPIEDIR)/include 13INCLUDEPATH += $(OPIEDIR)/include
14DEPENDPATH += $(OPIEDIR)/include 14DEPENDPATH += $(OPIEDIR)/include
15LIBS += -lqpe -lpthread -lopie -lxine -lxineutils 15LIBS += -lqpe -lpthread -lopie -lxine -lxineutils
16 16
17INCLUDEPATH += $(OPIEDIR)/include 17INCLUDEPATH += $(OPIEDIR)/include
18DEPENDPATH += $(OPIEDIR)/include 18DEPENDPATH += $(OPIEDIR)/include
19 19
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
@@ -5,545 +5,478 @@
5 5
6#include <qpe/qpemenubar.h> 6#include <qpe/qpemenubar.h>
7#include <qpe/qpetoolbar.h> 7#include <qpe/qpetoolbar.h>
8#include <qpe/fileselector.h> 8#include <qpe/fileselector.h>
9#include <qpe/qpeapplication.h> 9#include <qpe/qpeapplication.h>
10#include <qpe/lnkproperties.h> 10#include <qpe/lnkproperties.h>
11#include <qpe/storage.h> 11#include <qpe/storage.h>
12 12
13#include <qpe/applnk.h> 13#include <qpe/applnk.h>
14#include <qpe/config.h> 14#include <qpe/config.h>
15#include <qpe/global.h> 15#include <qpe/global.h>
16#include <qpe/resource.h> 16#include <qpe/resource.h>
17#include <qaction.h> 17#include <qaction.h>
18#include <qcursor.h> 18#include <qcursor.h>
19#include <qimage.h> 19#include <qimage.h>
20#include <qfile.h> 20#include <qfile.h>
21#include <qdir.h> 21#include <qdir.h>
22#include <qlayout.h> 22#include <qlayout.h>
23#include <qlabel.h> 23#include <qlabel.h>
24#include <qlist.h> 24#include <qlist.h>
25#include <qlistbox.h> 25#include <qlistbox.h>
26#include <qmainwindow.h> 26#include <qmainwindow.h>
27#include <qmessagebox.h> 27#include <qmessagebox.h>
28#include <qtoolbutton.h> 28#include <qtoolbutton.h>
29#include <qtabwidget.h> 29#include <qtabwidget.h>
30#include <qlistview.h> 30#include <qlistview.h>
31#include <qpoint.h> 31#include <qpoint.h>
32#include <qlineedit.h> 32#include <qlineedit.h>
33#include <qpushbutton.h> 33#include <qpushbutton.h>
34#include <qregexp.h> 34#include <qregexp.h>
35#include <qtextstream.h> 35#include <qtextstream.h>
36 36
37//#include <qtimer.h>
38 37
39#include "playlistselection.h" 38#include "playlistselection.h"
40#include "playlistwidget.h" 39#include "playlistwidget.h"
41#include "mediaplayerstate.h" 40#include "mediaplayerstate.h"
42 41
43#include "inputDialog.h" 42#include "inputDialog.h"
44 43
45#include <stdlib.h> 44#include <stdlib.h>
46#include "audiowidget.h" 45#include "audiowidget.h"
47#include "videowidget.h" 46#include "videowidget.h"
48 47
49#include <unistd.h> 48#include <unistd.h>
50#include <sys/file.h> 49#include <sys/file.h>
51#include <sys/ioctl.h> 50#include <sys/ioctl.h>
52#include <sys/soundcard.h> 51#include <sys/soundcard.h>
53 52
54// for setBacklight() 53// for setBacklight()
55#include <linux/fb.h> 54#include <linux/fb.h>
56#include <sys/types.h> 55#include <sys/types.h>
57#include <sys/stat.h> 56#include <sys/stat.h>
58#include <stdlib.h> 57#include <stdlib.h>
59 58
60#define BUTTONS_ON_TOOLBAR 59#define BUTTONS_ON_TOOLBAR
61#define SIDE_BUTTONS 60#define SIDE_BUTTONS
62#define CAN_SAVE_LOAD_PLAYLISTS 61#define CAN_SAVE_LOAD_PLAYLISTS
63 62
64extern AudioWidget *audioUI;
65extern VideoWidget *videoUI;
66extern MediaPlayerState *mediaPlayerState; 63extern MediaPlayerState *mediaPlayerState;
67 64
68// class myFileSelector {
69 65
70// };
71class PlayListWidgetPrivate { 66class PlayListWidgetPrivate {
72public: 67public:
73 QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove; 68 QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList, *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
74 QFrame *playListFrame; 69 QFrame *playListFrame;
75 FileSelector *files; 70 FileSelector *files;
76 PlayListSelection *selectedFiles; 71 PlayListSelection *selectedFiles;
77 bool setDocumentUsed; 72 bool setDocumentUsed;
78 DocLnk *current; 73 DocLnk *current;
79}; 74};
80 75
81 76
82class ToolButton : public QToolButton { 77class ToolButton : public QToolButton {
83public: 78public:
84 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE ) 79 ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
85 : QToolButton( parent, name ) { 80 : QToolButton( parent, name ) {
86 setTextLabel( name ); 81 setTextLabel( name );
87 setPixmap( Resource::loadPixmap( icon ) ); 82 setPixmap( Resource::loadPixmap( icon ) );
88 setAutoRaise( TRUE ); 83 setAutoRaise( TRUE );
89 setFocusPolicy( QWidget::NoFocus ); 84 setFocusPolicy( QWidget::NoFocus );
90 setToggleButton( t ); 85 setToggleButton( t );
91 connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot ); 86 connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
92 QPEMenuToolFocusManager::manager()->addWidget( this ); 87 QPEMenuToolFocusManager::manager()->addWidget( this );
93 } 88 }
94}; 89};
95 90
96 91
97class MenuItem : public QAction { 92class MenuItem : public QAction {
98public: 93public:
99 MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot ) 94 MenuItem( QWidget *parent, const QString& text, QObject *handler, const QString& slot )
100 : QAction( text, QString::null, 0, 0 ) { 95 : QAction( text, QString::null, 0, 0 ) {
101 connect( this, SIGNAL( activated() ), handler, slot ); 96 connect( this, SIGNAL( activated() ), handler, slot );
102 addTo( parent ); 97 addTo( parent );
103 } 98 }
104}; 99};
105 100
106 101
107PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl ) 102PlayListWidget::PlayListWidget( QWidget* parent, const char* name, WFlags fl )
108 : QMainWindow( parent, name, fl ) { 103 : QMainWindow( parent, name, fl ) {
109 104
110 d = new PlayListWidgetPrivate; 105 d = new PlayListWidgetPrivate;
111 d->setDocumentUsed = FALSE; 106 d->setDocumentUsed = FALSE;
112 d->current = NULL; 107 d->current = NULL;
113 fromSetDocument = FALSE; 108 fromSetDocument = FALSE;
114 insanityBool=FALSE; 109 insanityBool=FALSE;
115 audioScan = FALSE; 110 audioScan = FALSE;
116 videoScan = FALSE; 111 videoScan = FALSE;
117// menuTimer = new QTimer( this ,"menu timer"),
118// connect( menuTimer, SIGNAL( timeout() ), SLOT( addSelected() ) );
119 112
120 setBackgroundMode( PaletteButton ); 113 setBackgroundMode( PaletteButton );
121 114
122 setCaption( tr("OpiePlayer") ); 115 setCaption( tr("OpiePlayer") );
123 setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) ); 116 setIcon( Resource::loadPixmap( "opieplayer/MPEGPlayer" ) );
124 117
125 setToolBarsMovable( FALSE ); 118 setToolBarsMovable( FALSE );
126 119
127 // Create Toolbar 120 // Create Toolbar
128 QPEToolBar *toolbar = new QPEToolBar( this ); 121 QPEToolBar *toolbar = new QPEToolBar( this );
129 toolbar->setHorizontalStretchable( TRUE ); 122 toolbar->setHorizontalStretchable( TRUE );
130 123
131 // Create Menubar 124 // Create Menubar
132 QPEMenuBar *menu = new QPEMenuBar( toolbar ); 125 QPEMenuBar *menu = new QPEMenuBar( toolbar );
133 menu->setMargin( 0 ); 126 menu->setMargin( 0 );
134 127
135 QPEToolBar *bar = new QPEToolBar( this ); 128 QPEToolBar *bar = new QPEToolBar( this );
136 bar->setLabel( tr( "Play Operations" ) ); 129 bar->setLabel( tr( "Play Operations" ) );
137// d->tbPlayCurList = new ToolButton( bar, tr( "play List" ), "opieplayer/play_current_list", 130
138// this , SLOT( addSelected()) );
139 tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close"); 131 tbDeletePlaylist = new QPushButton( Resource::loadIconSet("trash"),"",bar,"close");
140 tbDeletePlaylist->setFlat(TRUE); 132 tbDeletePlaylist->setFlat(TRUE);
141 tbDeletePlaylist->setFixedSize(20,20); 133 tbDeletePlaylist->setFixedSize(20,20);
142 134
143 d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist", 135 d->tbAddToList = new ToolButton( bar, tr( "Add to Playlist" ), "opieplayer/add_to_playlist",
144 this , SLOT(addSelected()) ); 136 this , SLOT(addSelected()) );
145 d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist", 137 d->tbRemoveFromList = new ToolButton( bar, tr( "Remove from Playlist" ), "opieplayer/remove_from_playlist",
146 this , SLOT(removeSelected()) ); 138 this , SLOT(removeSelected()) );
147// d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play", /*this */mediaPlayerState , SLOT(setPlaying(bool) /* btnPlay() */), TRUE );
148 d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play", 139 d->tbPlay = new ToolButton( bar, tr( "Play" ), "opieplayer/play",
149 this , SLOT( btnPlay(bool) ), TRUE ); 140 this , SLOT( btnPlay(bool) ), TRUE );
150 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer/shuffle", 141 d->tbShuffle = new ToolButton( bar, tr( "Randomize" ),"opieplayer/shuffle",
151 mediaPlayerState, SLOT(setShuffled(bool)), TRUE ); 142 mediaPlayerState, SLOT(setShuffled(bool)), TRUE );
152 d->tbLoop = new ToolButton( bar, tr( "Loop" ),"opieplayer/loop", 143 d->tbLoop = new ToolButton( bar, tr( "Loop" ),"opieplayer/loop",
153 mediaPlayerState, SLOT(setLooping(bool)), TRUE ); 144 mediaPlayerState, SLOT(setLooping(bool)), TRUE );
154 tbDeletePlaylist->hide(); 145 tbDeletePlaylist->hide();
155 146
156 QPopupMenu *pmPlayList = new QPopupMenu( this ); 147 QPopupMenu *pmPlayList = new QPopupMenu( this );
157 menu->insertItem( tr( "File" ), pmPlayList ); 148 menu->insertItem( tr( "File" ), pmPlayList );
158 new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) ); 149 new MenuItem( pmPlayList, tr( "Clear List" ), this, SLOT( clearList() ) );
159 new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) ); 150 new MenuItem( pmPlayList, tr( "Add all audio files" ), this, SLOT( addAllMusicToList() ) );
160 new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) ); 151 new MenuItem( pmPlayList, tr( "Add all video files" ), this, SLOT( addAllVideoToList() ) );
161 new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) ); 152 new MenuItem( pmPlayList, tr( "Add all files" ), this, SLOT( addAllToList() ) );
162 pmPlayList->insertSeparator(-1); 153 pmPlayList->insertSeparator(-1);
163 new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) ); 154 new MenuItem( pmPlayList, tr( "Save PlayList" ), this, SLOT( saveList() ) );
164 new MenuItem( pmPlayList, tr( "Export playlist to m3u" ), this, SLOT(writem3u() ) ); 155 new MenuItem( pmPlayList, tr( "Export playlist to m3u" ), this, SLOT(writem3u() ) );
165 pmPlayList->insertSeparator(-1); 156 pmPlayList->insertSeparator(-1);
166 new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) ); 157 new MenuItem( pmPlayList, tr( "Open File or URL" ), this,SLOT( openFile() ) );
167 pmPlayList->insertSeparator(-1); 158 pmPlayList->insertSeparator(-1);
168 new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) ); 159 new MenuItem( pmPlayList, tr( "Rescan for Audio Files" ), this,SLOT( scanForAudio() ) );
169 new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) ); 160 new MenuItem( pmPlayList, tr( "Rescan for Video Files" ), this,SLOT( scanForVideo() ) );
170 161
171 QPopupMenu *pmView = new QPopupMenu( this ); 162 QPopupMenu *pmView = new QPopupMenu( this );
172 menu->insertItem( tr( "View" ), pmView ); 163 menu->insertItem( tr( "View" ), pmView );
173 164
174 fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0); 165 fullScreenButton = new QAction(tr("Full Screen"), Resource::loadPixmap("fullscreen"), QString::null, 0, this, 0);
175 fullScreenButton->addTo(pmView); 166 fullScreenButton->addTo(pmView);
176 scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0); 167 scaleButton = new QAction(tr("Scale"), Resource::loadPixmap("opieplayer/scale"), QString::null, 0, this, 0);
177 scaleButton->addTo(pmView); 168 scaleButton->addTo(pmView);
178 169
179 QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton ); 170 QVBox *vbox5 = new QVBox( this ); vbox5->setBackgroundMode( PaletteButton );
180 QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton ); 171 QVBox *vbox4 = new QVBox( vbox5 ); vbox4->setBackgroundMode( PaletteButton );
181 172
182 QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton ); 173 QHBox *hbox6 = new QHBox( vbox4 ); hbox6->setBackgroundMode( PaletteButton );
183 174
184 tabWidget = new QTabWidget( hbox6, "tabWidget" ); 175 tabWidget = new QTabWidget( hbox6, "tabWidget" );
185 tabWidget->setTabShape(QTabWidget::Triangular); 176 tabWidget->setTabShape(QTabWidget::Triangular);
186 177
187 QWidget *pTab; 178 QWidget *pTab;
188 pTab = new QWidget( tabWidget, "pTab" ); 179 pTab = new QWidget( tabWidget, "pTab" );
189// playlistView = new QListView( pTab, "playlistview" );
190// playlistView->setMinimumSize(236,260);
191 tabWidget->insertTab( pTab,"Playlist"); 180 tabWidget->insertTab( pTab,"Playlist");
192 181
193 182
194 // Add the playlist area 183 // Add the playlist area
195 184
196 QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton ); 185 QVBox *vbox3 = new QVBox( pTab ); vbox3->setBackgroundMode( PaletteButton );
197 d->playListFrame = vbox3; 186 d->playListFrame = vbox3;
198 d->playListFrame ->setMinimumSize(235,260); 187 d->playListFrame ->setMinimumSize(235,260);
199 188
200 QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton ); 189 QHBox *hbox2 = new QHBox( vbox3 ); hbox2->setBackgroundMode( PaletteButton );
201 190
202 d->selectedFiles = new PlayListSelection( hbox2); 191 d->selectedFiles = new PlayListSelection( hbox2);
203 QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton ); 192 QVBox *vbox1 = new QVBox( hbox2 ); vbox1->setBackgroundMode( PaletteButton );
204 193
205 QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold); 194 QPEApplication::setStylusOperation( d->selectedFiles->viewport(),QPEApplication::RightOnHold);
206 195
207
208
209 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch 196 QVBox *stretch1 = new QVBox( vbox1 ); stretch1->setBackgroundMode( PaletteButton ); // add stretch
210 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) ); 197 new ToolButton( vbox1, tr( "Move Up" ), "opieplayer/up", d->selectedFiles, SLOT(moveSelectedUp()) );
211 new ToolButton( vbox1, tr( "Remove" ), "opieplayer/cut", d->selectedFiles, SLOT(removeSelected()) ); 198 new ToolButton( vbox1, tr( "Remove" ), "opieplayer/cut", d->selectedFiles, SLOT(removeSelected()) );
212 new ToolButton( vbox1, tr( "Move Down" ), "opieplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) ); 199 new ToolButton( vbox1, tr( "Move Down" ), "opieplayer/down", d->selectedFiles, SLOT(moveSelectedDown()) );
213 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch 200 QVBox *stretch2 = new QVBox( vbox1 ); stretch2->setBackgroundMode( PaletteButton ); // add stretch
214 201
215 QWidget *aTab; 202 QWidget *aTab;
216 aTab = new QWidget( tabWidget, "aTab" ); 203 aTab = new QWidget( tabWidget, "aTab" );
217 audioView = new QListView( aTab, "Audioview" ); 204 audioView = new QListView( aTab, "Audioview" );
218 audioView->setMinimumSize(233,260); 205 audioView->setMinimumSize(233,260);
219 audioView->addColumn( tr("Title"),140); 206 audioView->addColumn( tr("Title"),140);
220 audioView->addColumn(tr("Size"), -1); 207 audioView->addColumn(tr("Size"), -1);
221 audioView->addColumn(tr("Media"),-1); 208 audioView->addColumn(tr("Media"),-1);
222 audioView->setColumnAlignment(1, Qt::AlignRight); 209 audioView->setColumnAlignment(1, Qt::AlignRight);
223 audioView->setColumnAlignment(2, Qt::AlignRight); 210 audioView->setColumnAlignment(2, Qt::AlignRight);
224 audioView->setAllColumnsShowFocus(TRUE); 211 audioView->setAllColumnsShowFocus(TRUE);
225 212
226 audioView->setMultiSelection( TRUE ); 213 audioView->setMultiSelection( TRUE );
227 audioView->setSelectionMode( QListView::Extended); 214 audioView->setSelectionMode( QListView::Extended);
228 215
229 tabWidget->insertTab(aTab,tr("Audio")); 216 tabWidget->insertTab(aTab,tr("Audio"));
230 217
231 QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold); 218 QPEApplication::setStylusOperation( audioView->viewport(),QPEApplication::RightOnHold);
232 219
233// audioView
234// populateAudioView();
235// videowidget
236
237 QWidget *vTab; 220 QWidget *vTab;
238 vTab = new QWidget( tabWidget, "vTab" ); 221 vTab = new QWidget( tabWidget, "vTab" );
239 videoView = new QListView( vTab, "Videoview" ); 222 videoView = new QListView( vTab, "Videoview" );
240 videoView->setMinimumSize(233,260); 223 videoView->setMinimumSize(233,260);
241 224
242 videoView->addColumn(tr("Title"),140); 225 videoView->addColumn(tr("Title"),140);
243 videoView->addColumn(tr("Size"),-1); 226 videoView->addColumn(tr("Size"),-1);
244 videoView->addColumn(tr("Media"),-1); 227 videoView->addColumn(tr("Media"),-1);
245 videoView->setColumnAlignment(1, Qt::AlignRight); 228 videoView->setColumnAlignment(1, Qt::AlignRight);
246 videoView->setColumnAlignment(2, Qt::AlignRight); 229 videoView->setColumnAlignment(2, Qt::AlignRight);
247 videoView->setAllColumnsShowFocus(TRUE); 230 videoView->setAllColumnsShowFocus(TRUE);
248 videoView->setMultiSelection( TRUE ); 231 videoView->setMultiSelection( TRUE );
249 videoView->setSelectionMode( QListView::Extended); 232 videoView->setSelectionMode( QListView::Extended);
250 233
251 QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold); 234 QPEApplication::setStylusOperation( videoView->viewport(),QPEApplication::RightOnHold);
252 235
253 tabWidget->insertTab( vTab,tr("Video")); 236 tabWidget->insertTab( vTab,tr("Video"));
254// populateVideoView();
255 237
256//playlists list 238 //playlists list
257 QWidget *LTab; 239 QWidget *LTab;
258 LTab = new QWidget( tabWidget, "LTab" ); 240 LTab = new QWidget( tabWidget, "LTab" );
259 playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy 241 playLists = new FileSelector( "playlist/plain", LTab, "fileselector" , FALSE, FALSE); //buggy
260 playLists->setMinimumSize(233,260); 242 playLists->setMinimumSize(233,260);
261 tabWidget->insertTab(LTab,tr("Lists")); 243 tabWidget->insertTab(LTab,tr("Lists"));
262 244
263// connect( playLists, SIGNAL( newSelected( const DocLnk &) ), this, SLOT( newFile( const DocLnk & ) ) );
264
265// add the library area
266
267// connect( audioView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
268// this, SLOT( fauxPlay( QListViewItem *) ) );
269// connect( videoView, SIGNAL( rightButtonClicked( QListViewItem *, const QPoint &, int)),
270// this, SLOT( fauxPlay( QListViewItem *)) );
271
272// connect( audioView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
273// connect( videoView, SIGNAL( clicked( QListViewItem *) ), this, SLOT( fauxPlay( QListViewItem *) ) );
274
275 connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist())); 245 connect(tbDeletePlaylist,(SIGNAL(released())),SLOT( deletePlaylist()));
276 connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) ); 246 connect( fullScreenButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleFullscreen()) );
277 connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) ); 247 connect( scaleButton, SIGNAL(activated()), mediaPlayerState, SLOT(toggleScaled()) );
278 connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 248 connect( d->selectedFiles, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
279 this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) ); 249 this,SLOT( playlistViewPressed(int, QListViewItem *, const QPoint&, int)) );
280
281 connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 250 connect( audioView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
282 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); 251 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
283
284 connect( audioView, SIGNAL( returnPressed( QListViewItem *)), 252 connect( audioView, SIGNAL( returnPressed( QListViewItem *)),
285 this,SLOT( playIt( QListViewItem *)) ); 253 this,SLOT( playIt( QListViewItem *)) );
286 connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); 254 connect( audioView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
287
288 connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)), 255 connect( videoView, SIGNAL( mouseButtonPressed( int, QListViewItem *, const QPoint&, int)),
289 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) ); 256 this,SLOT( viewPressed(int, QListViewItem *, const QPoint&, int)) );
290 connect( videoView, SIGNAL( returnPressed( QListViewItem *)), 257 connect( videoView, SIGNAL( returnPressed( QListViewItem *)),
291 this,SLOT( playIt( QListViewItem *)) ); 258 this,SLOT( playIt( QListViewItem *)) );
292 connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) ); 259 connect( videoView, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( addToSelection( QListViewItem *) ) );
293
294 connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) ); 260 connect( playLists, SIGNAL( fileSelected( const DocLnk &) ), this, SLOT( loadList( const DocLnk & ) ) );
295
296
297 connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*))); 261 connect( tabWidget, SIGNAL (currentChanged(QWidget*)),this,SLOT(tabChanged(QWidget*)));
298
299 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) ); 262 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), d->tbPlay, SLOT( setOn( bool ) ) );
300 connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) ); 263 connect( mediaPlayerState, SIGNAL( loopingToggled( bool ) ), d->tbLoop, SLOT( setOn( bool ) ) );
301 connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) ); 264 connect( mediaPlayerState, SIGNAL( shuffledToggled( bool ) ), d->tbShuffle, SLOT( setOn( bool ) ) );
302 connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) ); 265 connect( mediaPlayerState, SIGNAL( playlistToggled( bool ) ), this, SLOT( setPlaylist( bool ) ) );
303
304 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) ); 266 connect( d->selectedFiles, SIGNAL( doubleClicked( QListViewItem *) ), this, SLOT( playIt( QListViewItem *) ) );
305// connect( d->selectedFiles, SIGNAL( fileSelected( const DocLnk & ) ), this, SLOT( addToSelection( const DocLnk & ) ) );
306 267
307 setCentralWidget( vbox5 ); 268 setCentralWidget( vbox5 );
308 269
309 Config cfg( "OpiePlayer" ); 270 Config cfg( "OpiePlayer" );
310 readConfig( cfg ); 271 readConfig( cfg );
311 QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); 272 QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
312// qDebug("currentList is "+currentPlaylist);
313 loadList(DocLnk( currentPlaylist)); 273 loadList(DocLnk( currentPlaylist));
314 setCaption(tr("OpiePlayer: ")+ currentPlaylist ); 274 setCaption(tr("OpiePlayer: ")+ currentPlaylist );
315 275
316 initializeStates(); 276 initializeStates();
317} 277}
318 278
319 279
320PlayListWidget::~PlayListWidget() { 280PlayListWidget::~PlayListWidget() {
321 Config cfg( "OpiePlayer" ); 281 Config cfg( "OpiePlayer" );
322 writeConfig( cfg ); 282 writeConfig( cfg );
323 283
324 284 if ( d->current ) {
325 if ( d->current )
326 delete d->current; 285 delete d->current;
286 }
327 delete d; 287 delete d;
328} 288}
329 289
330 290
331void PlayListWidget::initializeStates() { 291void PlayListWidget::initializeStates() {
332 292
333 d->tbPlay->setOn( mediaPlayerState->playing() ); 293 d->tbPlay->setOn( mediaPlayerState->playing() );
334 d->tbLoop->setOn( mediaPlayerState->looping() ); 294 d->tbLoop->setOn( mediaPlayerState->looping() );
335 d->tbShuffle->setOn( mediaPlayerState->shuffled() ); 295 d->tbShuffle->setOn( mediaPlayerState->shuffled() );
336// d->tbFull->setOn( mediaPlayerState->fullscreen() );
337// d->tbScale->setOn( mediaPlayerState->scaled() );
338// d->tbScale->setEnabled( mediaPlayerState->fullscreen() );
339// setPlaylist( mediaPlayerState->playlist() );
340 setPlaylist( true); 296 setPlaylist( true);
341// d->selectedFiles->first();
342
343} 297}
344 298
345 299
346void PlayListWidget::readConfig( Config& cfg ) { 300void PlayListWidget::readConfig( Config& cfg ) {
347 cfg.setGroup("PlayList"); 301 cfg.setGroup("PlayList");
348 QString currentString = cfg.readEntry("current", "" ); 302 QString currentString = cfg.readEntry("current", "" );
349 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); 303 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
350 for ( int i = 0; i < noOfFiles; i++ ) { 304 for ( int i = 0; i < noOfFiles; i++ ) {
351 QString entryName; 305 QString entryName;
352 entryName.sprintf( "File%i", i + 1 ); 306 entryName.sprintf( "File%i", i + 1 );
353 QString linkFile = cfg.readEntry( entryName ); 307 QString linkFile = cfg.readEntry( entryName );
354 DocLnk lnk( linkFile ); 308 DocLnk lnk( linkFile );
355 if ( lnk.isValid() ) { 309 if ( lnk.isValid() ) {
356 d->selectedFiles->addToSelection( lnk ); 310 d->selectedFiles->addToSelection( lnk );
357 } 311 }
358 } 312 }
359 d->selectedFiles->setSelectedItem( currentString); 313 d->selectedFiles->setSelectedItem( currentString);
360// d->selectedFiles->setSelectedItem( (const QString &)currentString);
361} 314}
362 315
363 316
364void PlayListWidget::writeConfig( Config& cfg ) const { 317void PlayListWidget::writeConfig( Config& cfg ) const {
365 318
366 d->selectedFiles->writeCurrent( cfg); 319 d->selectedFiles->writeCurrent( cfg);
367 cfg.setGroup("PlayList"); 320 cfg.setGroup("PlayList");
368 int noOfFiles = 0; 321 int noOfFiles = 0;
369 d->selectedFiles->first(); 322 d->selectedFiles->first();
370 do { 323 do {
371 const DocLnk *lnk = d->selectedFiles->current(); 324 const DocLnk *lnk = d->selectedFiles->current();
372 if ( lnk ) { 325 if ( lnk ) {
373 QString entryName; 326 QString entryName;
374 entryName.sprintf( "File%i", noOfFiles + 1 ); 327 entryName.sprintf( "File%i", noOfFiles + 1 );
375// qDebug(entryName);
376 cfg.writeEntry( entryName, lnk->linkFile() ); 328 cfg.writeEntry( entryName, lnk->linkFile() );
377 // if this link does exist, add it so we have the file 329 // if this link does exist, add it so we have the file
378 // next time... 330 // next time...
379 if ( !QFile::exists( lnk->linkFile() ) ) { 331 if ( !QFile::exists( lnk->linkFile() ) ) {
380 // the way writing lnks doesn't really check for out 332 // the way writing lnks doesn't really check for out
381 // of disk space, but check it anyway. 333 // of disk space, but check it anyway.
382 if ( !lnk->writeLink() ) { 334 if ( !lnk->writeLink() ) {
383 QMessageBox::critical( 0, tr("Out of space"), 335 QMessageBox::critical( 0, tr("Out of space"),
384 tr( "There was a problem saving " 336 tr( "There was a problem saving "
385 "the playlist.\n" 337 "the playlist.\n"
386 "Your playlist " 338 "Your playlist "
387 "may be missing some entries\n" 339 "may be missing some entries\n"
388 "the next time you start it." ) 340 "the next time you start it." )
389 ); 341 );
390 } 342 }
391 } 343 }
392 noOfFiles++; 344 noOfFiles++;
393 } 345 }
394 } 346 }
395 while ( d->selectedFiles->next() ); 347 while ( d->selectedFiles->next() );
396 cfg.writeEntry("NumberOfFiles", noOfFiles ); 348 cfg.writeEntry("NumberOfFiles", noOfFiles );
397} 349}
398 350
399 351
400void PlayListWidget::addToSelection( const DocLnk& lnk ) { 352void PlayListWidget::addToSelection( const DocLnk& lnk ) {
401// qDebug("add");
402// if( lnk.file().find(" ",0,TRUE) != -1 || lnk.file().find("%20",0,TRUE) != -1) {
403// QMessageBox::message("Note","You are trying to play\na malformed url.");
404
405// } else {
406
407 d->setDocumentUsed = FALSE; 353 d->setDocumentUsed = FALSE;
408 if ( mediaPlayerState->playlist() ) { 354 if ( mediaPlayerState->playlist() ) {
409 if(QFileInfo(lnk.file()).exists() || lnk.file().left(4) == "http" ) 355 if(QFileInfo(lnk.file()).exists() || lnk.file().left(4) == "http" )
410 d->selectedFiles->addToSelection( lnk ); 356 d->selectedFiles->addToSelection( lnk );
411 } 357 }
412 else 358 else
413 mediaPlayerState->setPlaying( TRUE ); 359 mediaPlayerState->setPlaying( TRUE );
414// }
415} 360}
416 361
417 362
418void PlayListWidget::clearList() { 363void PlayListWidget::clearList() {
419 while ( first() ) 364 while ( first() ) {
420 d->selectedFiles->removeSelected(); 365 d->selectedFiles->removeSelected();
366 }
421} 367}
422 368
423 369
424void PlayListWidget::addAllToList() { 370void PlayListWidget::addAllToList() {
425 DocLnkSet filesAll; 371 DocLnkSet filesAll;
426 Global::findDocuments(&filesAll, "video/*;audio/*"); 372 Global::findDocuments(&filesAll, "video/*;audio/*");
427 QListIterator<DocLnk> Adit( filesAll.children() ); 373 QListIterator<DocLnk> Adit( filesAll.children() );
428 for ( ; Adit.current(); ++Adit ) 374 for ( ; Adit.current(); ++Adit ) {
429 if(QFileInfo(Adit.current()->file()).exists()) 375 if(QFileInfo(Adit.current()->file()).exists()) {
430 d->selectedFiles->addToSelection( **Adit ); 376 d->selectedFiles->addToSelection( **Adit );
377 }
378 }
431} 379}
432 380
433 381
434void PlayListWidget::addAllMusicToList() { 382void PlayListWidget::addAllMusicToList() {
435 QListIterator<DocLnk> dit( files.children() ); 383 QListIterator<DocLnk> dit( files.children() );
436 for ( ; dit.current(); ++dit ) 384 for ( ; dit.current(); ++dit ) {
437 if(QFileInfo(dit.current()->file()).exists()) 385 if(QFileInfo(dit.current()->file()).exists()) {
438 d->selectedFiles->addToSelection( **dit ); 386 d->selectedFiles->addToSelection( **dit );
387 }
388 }
439} 389}
440 390
441 391
442void PlayListWidget::addAllVideoToList() { 392void PlayListWidget::addAllVideoToList() {
443 QListIterator<DocLnk> dit( vFiles.children() ); 393 QListIterator<DocLnk> dit( vFiles.children() );
444 for ( ; dit.current(); ++dit ) 394 for ( ; dit.current(); ++dit )
445 if(QFileInfo( dit.current()->file()).exists()) 395 if(QFileInfo( dit.current()->file()).exists())
446 d->selectedFiles->addToSelection( **dit ); 396 d->selectedFiles->addToSelection( **dit );
447} 397}
448 398
449 399
450void PlayListWidget::setDocument(const QString& fileref) { 400void PlayListWidget::setDocument(const QString& fileref) {
451 qDebug(fileref); 401 qDebug(fileref);
452 fromSetDocument = TRUE; 402 fromSetDocument = TRUE;
453 if ( fileref.isNull() ) { 403 if ( fileref.isNull() ) {
454 QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) ); 404 QMessageBox::critical( 0, tr( "Invalid File" ), tr( "There was a problem in getting the file." ) );
455 return; 405 return;
456 } 406 }
457// qDebug("setDocument "+fileref); 407
458 if(fileref.find("m3u",0,TRUE) != -1) { //is m3u 408 if(fileref.find("m3u",0,TRUE) != -1) { //is m3u
459 readm3u( fileref); 409 readm3u( fileref);
460 } 410 } else if(fileref.find("pls",0,TRUE) != -1) { //is pls
461 else if(fileref.find("pls",0,TRUE) != -1) { //is pls
462 readPls( fileref); 411 readPls( fileref);
463 } 412 } else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist
464 else if(fileref.find("playlist",0,TRUE) != -1) {//is playlist
465 clearList(); 413 clearList();
466 loadList(DocLnk(fileref)); 414 loadList(DocLnk(fileref));
467 d->selectedFiles->first(); 415 d->selectedFiles->first();
468 } else { 416 } else {
469 clearList(); 417 clearList();
470 addToSelection( DocLnk( fileref ) ); 418 addToSelection( DocLnk( fileref ) );
471 d->setDocumentUsed = TRUE; 419 d->setDocumentUsed = TRUE;
472 mediaPlayerState->setPlaying( FALSE ); 420 mediaPlayerState->setPlaying( FALSE );
473 qApp->processEvents(); 421 qApp->processEvents();
474 mediaPlayerState->setPlaying( TRUE ); 422 mediaPlayerState->setPlaying( TRUE );
475 qApp->processEvents(); 423 qApp->processEvents();
476 setCaption(tr("OpiePlayer")); 424 setCaption(tr("OpiePlayer"));
477 } 425 }
478} 426}
479 427
480 428
481void PlayListWidget::setActiveWindow() { 429void PlayListWidget::setActiveWindow() {
482 // When we get raised we need to ensure that it switches views 430 // When we get raised we need to ensure that it switches views
483 char origView = mediaPlayerState->view(); 431 char origView = mediaPlayerState->view();
484 mediaPlayerState->setView( 'l' ); // invalidate 432 mediaPlayerState->setView( 'l' ); // invalidate
485 mediaPlayerState->setView( origView ); // now switch back 433 mediaPlayerState->setView( origView ); // now switch back
486} 434}
487 435
488 436
489void PlayListWidget::useSelectedDocument() { 437void PlayListWidget::useSelectedDocument() {
490 d->setDocumentUsed = FALSE; 438 d->setDocumentUsed = FALSE;
491} 439}
492 440
493 441
494const DocLnk *PlayListWidget::current() { // this is fugly 442const DocLnk *PlayListWidget::current() { // this is fugly
495 443
496// if( fromSetDocument) {
497// qDebug("from setDoc");
498// DocLnkSet files;
499// Global::findDocuments(&files, "video/*;audio/*");
500// QListIterator<DocLnk> dit( files.children() );
501// for ( ; dit.current(); ++dit ) {
502// if(dit.current()->linkFile() == setDocFileRef) {
503// qDebug(setDocFileRef);
504// return dit;
505// }
506// }
507// } else
508
509
510 switch (tabWidget->currentPageIndex()) { 444 switch (tabWidget->currentPageIndex()) {
511 case 0: //playlist 445 case 0: //playlist
512 { 446 {
513 qDebug("playlist"); 447 qDebug("playlist");
514 if ( mediaPlayerState->playlist() ) { 448 if ( mediaPlayerState->playlist() ) {
515 return d->selectedFiles->current(); 449 return d->selectedFiles->current();
516 } 450 } else if ( d->setDocumentUsed && d->current ) {
517 else if ( d->setDocumentUsed && d->current ) {
518 return d->current; 451 return d->current;
519 } else { 452 } else {
520 return d->files->selected(); 453 return d->files->selected();
521 } 454 }
522 } 455 }
523 break; 456 break;
524 case 1://audio 457 case 1://audio
525 { 458 {
526 qDebug("audioView"); 459 qDebug("audioView");
527 QListIterator<DocLnk> dit( files.children() ); 460 QListIterator<DocLnk> dit( files.children() );
528 for ( ; dit.current(); ++dit ) { 461 for ( ; dit.current(); ++dit ) {
529 if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) { 462 if( dit.current()->name() == audioView->currentItem()->text(0) && !insanityBool) {
530 qDebug("here"); 463 qDebug("here");
531 insanityBool=TRUE; 464 insanityBool=TRUE;
532 return dit; 465 return dit;
533 } 466 }
534 } 467 }
535 } 468 }
536 break; 469 break;
537 case 2: // video 470 case 2: // video
538 { 471 {
539 qDebug("videoView"); 472 qDebug("videoView");
540 QListIterator<DocLnk> Vdit( vFiles.children() ); 473 QListIterator<DocLnk> Vdit( vFiles.children() );
541 for ( ; Vdit.current(); ++Vdit ) { 474 for ( ; Vdit.current(); ++Vdit ) {
542 if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) { 475 if( Vdit.current()->name() == videoView->currentItem()->text(0) && !insanityBool) {
543 insanityBool=TRUE; 476 insanityBool=TRUE;
544 return Vdit; 477 return Vdit;
545 } 478 }
546 } 479 }
547 } 480 }
548 break; 481 break;
549 }; 482 };
@@ -596,190 +529,173 @@ bool PlayListWidget::next() {
596 } else { 529 } else {
597 return mediaPlayerState->looping(); 530 return mediaPlayerState->looping();
598 } 531 }
599} 532}
600 533
601 534
602bool PlayListWidget::first() { 535bool PlayListWidget::first() {
603 if ( mediaPlayerState->playlist() ) 536 if ( mediaPlayerState->playlist() )
604 return d->selectedFiles->first(); 537 return d->selectedFiles->first();
605 else 538 else
606 return mediaPlayerState->looping(); 539 return mediaPlayerState->looping();
607} 540}
608 541
609 542
610bool PlayListWidget::last() { 543bool PlayListWidget::last() {
611 if ( mediaPlayerState->playlist() ) 544 if ( mediaPlayerState->playlist() )
612 return d->selectedFiles->last(); 545 return d->selectedFiles->last();
613 else 546 else
614 return mediaPlayerState->looping(); 547 return mediaPlayerState->looping();
615} 548}
616 549
617 550
618void PlayListWidget::saveList() { 551void PlayListWidget::saveList() {
619 552
620 QString filename; 553 QString filename;
621 InputDialog *fileDlg; 554 InputDialog *fileDlg;
622 fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0); 555 fileDlg = new InputDialog(this,tr("Save Playlist"),TRUE, 0);
623 fileDlg->exec(); 556 fileDlg->exec();
624 if( fileDlg->result() == 1 ) { 557 if( fileDlg->result() == 1 ) {
625 if ( d->current ) 558 if ( d->current )
626 delete d->current; 559 delete d->current;
627 filename = fileDlg->LineEdit1->text();//+".playlist"; 560 filename = fileDlg->LineEdit1->text();//+".playlist";
628// qDebug("saving playlist "+filename+".playlist"); 561 // qDebug("saving playlist "+filename+".playlist");
629 Config cfg( filename +".playlist"); 562 Config cfg( filename +".playlist");
630 writeConfig( cfg ); 563 writeConfig( cfg );
631 564
632 DocLnk lnk; 565 DocLnk lnk;
633// lnk.setComment( "");
634 lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property 566 lnk.setFile(QDir::homeDirPath()+"/Settings/"+filename+".playlist.conf"); //sets File property
635 lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D 567 lnk.setType("playlist/plain");// hey is this a REGISTERED mime type?!?!? ;D
636 lnk.setIcon("opieplayer/playlist2"); 568 lnk.setIcon("opieplayer/playlist2");
637 lnk.setName( filename); //sets file name 569 lnk.setName( filename); //sets file name
638// qDebug(filename); 570 // qDebug(filename);
639 if(!lnk.writeLink()) 571 if(!lnk.writeLink()) {
640 qDebug("Writing doclink did not work"); 572 qDebug("Writing doclink did not work");
573 }
641 } 574 }
642 Config config( "OpiePlayer" ); 575 Config config( "OpiePlayer" );
643 config.writeEntry("CurrentPlaylist",filename); 576 config.writeEntry("CurrentPlaylist",filename);
644 setCaption(tr("OpiePlayer: ")+filename); 577 setCaption(tr("OpiePlayer: ")+filename);
645 d->selectedFiles->first(); 578 d->selectedFiles->first();
646 if(fileDlg) 579 if(fileDlg) {
647 delete fileDlg; 580 delete fileDlg;
581 }
648} 582}
649 583
650void PlayListWidget::loadList( const DocLnk & lnk) { 584void PlayListWidget::loadList( const DocLnk & lnk) {
651 QString name= lnk.name(); 585 QString name= lnk.name();
652// qDebug("currentList is "+name); 586 // qDebug("currentList is "+name);
653 if( name.length()>1) { 587 if( name.length()>1) {
654 setCaption("OpiePlayer: "+name); 588 setCaption("OpiePlayer: "+name);
655// qDebug("load list "+ name+".playlist"); 589 // qDebug("load list "+ name+".playlist");
656 clearList(); 590 clearList();
657 Config cfg( name+".playlist"); 591 Config cfg( name+".playlist");
658 readConfig(cfg); 592 readConfig(cfg);
659 593
660 tabWidget->setCurrentPage(0); 594 tabWidget->setCurrentPage(0);
661 595
662 Config config( "OpiePlayer" ); 596 Config config( "OpiePlayer" );
663 config.writeEntry("CurrentPlaylist", name); 597 config.writeEntry("CurrentPlaylist", name);
664// d->selectedFiles->first(); 598 // d->selectedFiles->first();
665 } 599 }
666 600
667} 601}
668 602
669void PlayListWidget::setPlaylist( bool shown ) { 603void PlayListWidget::setPlaylist( bool shown ) {
670 if ( shown ) 604 if ( shown ) {
671 d->playListFrame->show(); 605 d->playListFrame->show();
672 else 606 } else {
673 d->playListFrame->hide(); 607 d->playListFrame->hide();
608 }
674} 609}
675 610
676void PlayListWidget::setView( char view ) { 611void PlayListWidget::setView( char view ) {
677 if ( view == 'l' ) 612 if ( view == 'l' )
678 showMaximized(); 613 showMaximized();
679 else 614 else
680 hide(); 615 hide();
681} 616}
682 617
683void PlayListWidget::addSelected() { 618void PlayListWidget::addSelected() {
684 619
685 Config cfg( "OpiePlayer" ); 620 Config cfg( "OpiePlayer" );
686 cfg.setGroup("PlayList"); 621 cfg.setGroup("PlayList");
687 QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); 622 QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
688 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); 623 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
689 624
690 switch (tabWidget->currentPageIndex()) { 625 switch (tabWidget->currentPageIndex()) {
691 case 0: //playlist 626 case 0: //playlist
692 break; 627 break;
693 case 1: { //audio 628 case 1: { //audio
694// QString entryName;
695// entryName.sprintf( "File%i", i + 1 );
696// QString linkFile = cfg.readEntry( entryName );
697 QListViewItemIterator it( audioView ); 629 QListViewItemIterator it( audioView );
698 // iterate through all items of the listview 630 // iterate through all items of the listview
699 for ( ; it.current(); ++it ) { 631 for ( ; it.current(); ++it ) {
700 if ( it.current()->isSelected() ) { 632 if ( it.current()->isSelected() ) {
701 QListIterator<DocLnk> dit( files.children() ); 633 QListIterator<DocLnk> dit( files.children() );
702 for ( ; dit.current(); ++dit ) { 634 for ( ; dit.current(); ++dit ) {
703 if( dit.current()->name() == it.current()->text(0) ) { 635 if( dit.current()->name() == it.current()->text(0) ) {
704 d->selectedFiles->addToSelection( **dit ); 636 d->selectedFiles->addToSelection( **dit );
705 } 637 }
706 } 638 }
707 audioView->setSelected( it.current(),FALSE); 639 audioView->setSelected( it.current(),FALSE);
708 } 640 }
709 } 641 }
710 tabWidget->setCurrentPage(0); 642 tabWidget->setCurrentPage(0);
711 } 643 }
712 break; 644 break;
713 case 2: { // video 645 case 2: { // video
714 QListViewItemIterator it( videoView ); 646 QListViewItemIterator it( videoView );
715 // iterate through all items of the listview 647 // iterate through all items of the listview
716 for ( ; it.current(); ++it ) { 648 for ( ; it.current(); ++it ) {
717 if ( it.current()->isSelected() ) { 649 if ( it.current()->isSelected() ) {
718 QListIterator<DocLnk> dit( vFiles.children() ); 650 QListIterator<DocLnk> dit( vFiles.children() );
719 for ( ; dit.current(); ++dit ) { 651 for ( ; dit.current(); ++dit ) {
720 if( dit.current()->name() == it.current()->text(0) ) { 652 if( dit.current()->name() == it.current()->text(0) ) {
721 d->selectedFiles->addToSelection( **dit ); 653 d->selectedFiles->addToSelection( **dit );
722 } 654 }
723 } 655 }
724
725 videoView->setSelected( it.current(),FALSE); 656 videoView->setSelected( it.current(),FALSE);
726 } 657 }
727 } 658 }
728// for ( int i = 0; i < noOfFiles; i++ ) {
729// QString entryName;
730// entryName.sprintf( "File%i", i + 1 );
731// QString linkFile = cfg.readEntry( entryName );
732// if( DocLnk( linkFile).name() == videoView->selectedItem()->text(0) ) {
733// int result= QMessageBox::warning(this,tr("OpiePlayer"),
734// tr("This is all ready in your playlist.\nContinue?"),
735// tr("Yes"),tr("No"),0,0,1);
736// if (result !=0)
737// return;
738// }
739// }
740// addToSelection( videoView->selectedItem() );
741 tabWidget->setCurrentPage(0); 659 tabWidget->setCurrentPage(0);
742 } 660 }
743 break; 661 break;
744 }; 662 };
745} 663}
746 664
747void PlayListWidget::removeSelected() { 665void PlayListWidget::removeSelected() {
748 d->selectedFiles->removeSelected( ); 666 d->selectedFiles->removeSelected( );
749} 667}
750 668
751void PlayListWidget::playIt( QListViewItem *it) { 669void PlayListWidget::playIt( QListViewItem *it) {
752// d->setDocumentUsed = FALSE;
753// mediaPlayerState->curPosition =0;
754 qDebug("playIt"); 670 qDebug("playIt");
755 mediaPlayerState->setPlaying(FALSE); 671 mediaPlayerState->setPlaying(FALSE);
756 mediaPlayerState->setPlaying(TRUE); 672 mediaPlayerState->setPlaying(TRUE);
757 d->selectedFiles->unSelect(); 673 d->selectedFiles->unSelect();
758} 674}
759 675
760void PlayListWidget::addToSelection( QListViewItem *it) { 676void PlayListWidget::addToSelection( QListViewItem *it) {
761 d->setDocumentUsed = FALSE; 677 d->setDocumentUsed = FALSE;
762 678
763 if(it) { 679 if(it) {
764 switch (tabWidget->currentPageIndex()) { 680 switch (tabWidget->currentPageIndex()) {
765 case 1: { 681 case 1: {
766 QListIterator<DocLnk> dit( files.children() ); 682 QListIterator<DocLnk> dit( files.children() );
767 for ( ; dit.current(); ++dit ) { 683 for ( ; dit.current(); ++dit ) {
768 if( dit.current()->name() == it->text(0)) { 684 if( dit.current()->name() == it->text(0)) {
769 d->selectedFiles->addToSelection( **dit ); 685 d->selectedFiles->addToSelection( **dit );
770 } 686 }
771 } 687 }
772 } 688 }
773 break; 689 break;
774 case 2: { 690 case 2: {
775 QListIterator<DocLnk> dit( vFiles.children() ); 691 QListIterator<DocLnk> dit( vFiles.children() );
776 for ( ; dit.current(); ++dit ) { 692 for ( ; dit.current(); ++dit ) {
777 if( dit.current()->name() == it->text(0)) { 693 if( dit.current()->name() == it->text(0)) {
778 d->selectedFiles->addToSelection( **dit ); 694 d->selectedFiles->addToSelection( **dit );
779 } 695 }
780 } 696 }
781 } 697 }
782 break; 698 break;
783 case 0: 699 case 0:
784 break; 700 break;
785 }; 701 };
@@ -804,323 +720,289 @@ void PlayListWidget::tabChanged(QWidget *widg) {
804 populateAudioView(); 720 populateAudioView();
805 721
806 if( !tbDeletePlaylist->isHidden()) 722 if( !tbDeletePlaylist->isHidden())
807 tbDeletePlaylist->hide(); 723 tbDeletePlaylist->hide();
808 d->tbRemoveFromList->setEnabled(FALSE); 724 d->tbRemoveFromList->setEnabled(FALSE);
809 d->tbAddToList->setEnabled(TRUE); 725 d->tbAddToList->setEnabled(TRUE);
810 } 726 }
811 break; 727 break;
812 case 2: 728 case 2:
813 { 729 {
814 videoView->clear(); 730 videoView->clear();
815 populateVideoView(); 731 populateVideoView();
816 if( !tbDeletePlaylist->isHidden()) 732 if( !tbDeletePlaylist->isHidden())
817 tbDeletePlaylist->hide(); 733 tbDeletePlaylist->hide();
818 d->tbRemoveFromList->setEnabled(FALSE); 734 d->tbRemoveFromList->setEnabled(FALSE);
819 d->tbAddToList->setEnabled(TRUE); 735 d->tbAddToList->setEnabled(TRUE);
820 } 736 }
821 break; 737 break;
822 case 3: 738 case 3:
823 { 739 {
824 if( tbDeletePlaylist->isHidden()) 740 if( tbDeletePlaylist->isHidden())
825 tbDeletePlaylist->show(); 741 tbDeletePlaylist->show();
826 playLists->reread(); 742 playLists->reread();
827 } 743 }
828 break; 744 break;
829 }; 745 };
830} 746}
831 747
832void PlayListWidget::btnPlay(bool b) { 748void PlayListWidget::btnPlay(bool b) {
833 749
834// mediaPlayerState->setPlaying(b); 750// mediaPlayerState->setPlaying(b);
835 switch ( tabWidget->currentPageIndex()) { 751 switch ( tabWidget->currentPageIndex()) {
836 case 0: 752 case 0:
837 {
838// if( d->selectedFiles->current()->file().find(" ",0,TRUE) != -1
839// if( d->selectedFiles->current()->file().find("%20",0,TRUE) != -1) {
840// QMessageBox::message("Note","You are trying to play\na malformed url.");
841// } else {
842 mediaPlayerState->setPlaying(b);
843// }
844 }
845 break;
846 case 1:
847 { 753 {
848 addToSelection( audioView->currentItem() );
849 mediaPlayerState->setPlaying(b); 754 mediaPlayerState->setPlaying(b);
850 d->selectedFiles->removeSelected( ); 755 }
851 tabWidget->setCurrentPage(1);
852 d->selectedFiles->unSelect();
853 insanityBool=FALSE;
854 }// audioView->clearSelection();
855 break;
856 case 2:
857 {
858 addToSelection( videoView->currentItem() );
859 mediaPlayerState->setPlaying(b);
860 qApp->processEvents();
861 d->selectedFiles->removeSelected( );
862 tabWidget->setCurrentPage(2);
863 d->selectedFiles->unSelect();
864 insanityBool=FALSE;
865 }// videoView->clearSelection();
866 break; 756 break;
757 case 1:
758 {
759 addToSelection( audioView->currentItem() );
760 mediaPlayerState->setPlaying(b);
761 d->selectedFiles->removeSelected( );
762 tabWidget->setCurrentPage(1);
763 d->selectedFiles->unSelect();
764 insanityBool=FALSE;
765 }// audioView->clearSelection();
766 break;
767 case 2:
768 {
769 addToSelection( videoView->currentItem() );
770 mediaPlayerState->setPlaying(b);
771 qApp->processEvents();
772 d->selectedFiles->removeSelected( );
773 tabWidget->setCurrentPage(2);
774 d->selectedFiles->unSelect();
775 insanityBool=FALSE;
776 }// videoView->clearSelection();
777 break;
867 }; 778 };
868 779
869} 780}
870 781
871void PlayListWidget::deletePlaylist() { 782void PlayListWidget::deletePlaylist() {
872 switch( QMessageBox::information( this, (tr("Remove Playlist?")), 783 switch( QMessageBox::information( this, (tr("Remove Playlist?")),
873 (tr("You really want to delete\nthis playlist?")), 784 (tr("You really want to delete\nthis playlist?")),
874 (tr("Yes")), (tr("No")), 0 )){ 785 (tr("Yes")), (tr("No")), 0 )){
875 case 0: // Yes clicked, 786 case 0: // Yes clicked,
876 QFile().remove(playLists->selected()->file()); 787 QFile().remove(playLists->selected()->file());
877 QFile().remove(playLists->selected()->linkFile()); 788 QFile().remove(playLists->selected()->linkFile());
878 playLists->reread(); 789 playLists->reread();
879 break; 790 break;
880 case 1: // Cancel 791 case 1: // Cancel
881 break; 792 break;
882 }; 793 };
883} 794}
884 795
885void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) 796void PlayListWidget::viewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) {
886{
887 switch (mouse) { 797 switch (mouse) {
888 case 1: 798 case 1:
889 break; 799 break;
890 case 2:{ 800 case 2:{
891
892 QPopupMenu m; 801 QPopupMenu m;
893 m.insertItem( tr( "Play" ), this, SLOT( playSelected() )); 802 m.insertItem( tr( "Play" ), this, SLOT( playSelected() ));
894 m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() )); 803 m.insertItem( tr( "Add to Playlist" ), this, SLOT( addSelected() ));
895 m.insertSeparator(); 804 m.insertSeparator();
896 if( QFile(QPEApplication::qpeDir()+"lib/libopie.so").exists() ) 805 m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
897 m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
898
899 m.exec( QCursor::pos() ); 806 m.exec( QCursor::pos() );
900 } 807 }
901 break; 808 break;
902 }; 809 };
903} 810}
904 811
905void PlayListWidget::playSelected() 812void PlayListWidget::playSelected() {
906{
907 btnPlay( TRUE); 813 btnPlay( TRUE);
908// d->selectedFiles->unSelect();
909} 814}
910 815
911void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) 816void PlayListWidget::playlistViewPressed( int mouse, QListViewItem *item, const QPoint& point, int i) {
912{
913 switch (mouse) { 817 switch (mouse) {
914 case 1: 818 case 1:
915 819
916 break; 820 break;
917 case 2:{ 821 case 2:
822 {
918 QPopupMenu m; 823 QPopupMenu m;
919 m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() )); 824 m.insertItem( tr( "Play Selected" ), this, SLOT( playSelected() ));
920 m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() )); 825 m.insertItem( tr( "Remove" ), this, SLOT( removeSelected() ));
921// m.insertSeparator();
922// m.insertItem( tr( "Properties" ), this, SLOT( listDelete() ));
923 m.exec( QCursor::pos() ); 826 m.exec( QCursor::pos() );
924 } 827 }
925 break; 828 break;
926 }; 829 };
927
928} 830}
929 831
930void PlayListWidget::listDelete() { 832void PlayListWidget::listDelete() {
931 Config cfg( "OpiePlayer" ); 833 Config cfg( "OpiePlayer" );
932 cfg.setGroup("PlayList"); 834 cfg.setGroup("PlayList");
933 QString currentPlaylist = cfg.readEntry("CurrentPlaylist",""); 835 QString currentPlaylist = cfg.readEntry("CurrentPlaylist","");
934 QString file; 836 QString file;
935 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 ); 837 int noOfFiles = cfg.readNumEntry("NumberOfFiles", 0 );
936 switch ( tabWidget->currentPageIndex()) { 838 switch ( tabWidget->currentPageIndex()) {
937 case 0: 839 case 0:
938 break; 840 break;
939 case 1: 841 case 1:
940 { 842 {
941 file = audioView->selectedItem()->text(0); 843 file = audioView->selectedItem()->text(0);
942// Global::findDocuments(&files, "audio/*");
943// AppLnkSet appFiles;
944 QListIterator<DocLnk> dit( files.children() ); 844 QListIterator<DocLnk> dit( files.children() );
945 for ( ; dit.current(); ++dit ) { 845 for ( ; dit.current(); ++dit ) {
946 if( dit.current()->name() == file) { 846 if( dit.current()->name() == file) {
947// qDebug(file); 847 // qDebug(file);
948 LnkProperties prop( dit.current() ); 848 LnkProperties prop( dit.current() );
949// connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
950 prop.showMaximized(); 849 prop.showMaximized();
951 prop.exec(); 850 prop.exec();
952 } 851 }
953 } 852 }
954 populateAudioView(); 853 populateAudioView();
955 } 854 }
956 break; 855 break;
957 case 2: 856 case 2:
958 { 857 {
959// file = videoView->selectedItem()->text(0); 858
960// for ( int i = 0; i < noOfFiles; i++ ) {
961// QString entryName;
962// entryName.sprintf( "File%i", i + 1 );
963// QString linkFile = cfg.readEntry( entryName );
964// AppLnk lnk( AppLnk(linkFile));
965// if( lnk.name() == file ) {
966// LnkProperties prop( &lnk);
967// // connect(&prop, SIGNAL(select(const AppLnk *)), this, SLOT(externalSelected(const AppLnk *)));
968// prop.showMaximized();
969// prop.exec();
970// }
971// }
972 } 859 }
973 break; 860 break;
974 }; 861 };
975} 862}
976 863
977void PlayListWidget::scanForAudio() { 864void PlayListWidget::scanForAudio() {
978 qDebug("scan for audio"); 865 qDebug("scan for audio");
979 files.detachChildren(); 866 files.detachChildren();
980 QListIterator<DocLnk> sdit( files.children() ); 867 QListIterator<DocLnk> sdit( files.children() );
981 for ( ; sdit.current(); ++sdit ) { 868 for ( ; sdit.current(); ++sdit ) {
982 delete sdit.current(); 869 delete sdit.current();
983 } 870 }
984 Global::findDocuments(&files, "audio/*"); 871 Global::findDocuments(&files, "audio/*");
985 audioScan = TRUE; 872 audioScan = TRUE;
986} 873}
987void PlayListWidget::scanForVideo() { 874void PlayListWidget::scanForVideo() {
988 qDebug("scan for video"); 875 qDebug("scan for video");
989 vFiles.detachChildren(); 876 vFiles.detachChildren();
990 QListIterator<DocLnk> sdit( vFiles.children() ); 877 QListIterator<DocLnk> sdit( vFiles.children() );
991 for ( ; sdit.current(); ++sdit ) { 878 for ( ; sdit.current(); ++sdit ) {
992 delete sdit.current(); 879 delete sdit.current();
993 } 880 }
994 Global::findDocuments(&vFiles, "video/*"); 881 Global::findDocuments(&vFiles, "video/*");
995 videoScan = TRUE; 882 videoScan = TRUE;
996} 883}
997 884
998void PlayListWidget::populateAudioView() { 885void PlayListWidget::populateAudioView() {
999 886
1000 audioView->clear(); 887 audioView->clear();
1001 StorageInfo storageInfo; 888 StorageInfo storageInfo;
1002 const QList<FileSystem> &fs = storageInfo.fileSystems(); 889 const QList<FileSystem> &fs = storageInfo.fileSystems();
1003 if(!audioScan) scanForAudio(); 890 if(!audioScan) scanForAudio();
1004 891
1005 QListIterator<DocLnk> dit( files.children() ); 892 QListIterator<DocLnk> dit( files.children() );
1006 QListIterator<FileSystem> it ( fs ); 893 QListIterator<FileSystem> it ( fs );
1007 894
1008 QString storage; 895 QString storage;
1009 for ( ; dit.current(); ++dit ) { 896 for ( ; dit.current(); ++dit ) {
1010 for( ; it.current(); ++it ){ 897 for( ; it.current(); ++it ){
1011 const QString name = (*it)->name(); 898 const QString name = (*it)->name();
1012 const QString path = (*it)->path(); 899 const QString path = (*it)->path();
1013 if(dit.current()->file().find(path) != -1 ) storage=name; 900 if(dit.current()->file().find(path) != -1 ) storage=name;
1014 } 901 }
1015 902
1016 QListViewItem * newItem; 903 QListViewItem * newItem;
1017 if ( QFile( dit.current()->file()).exists() ) { 904 if ( QFile( dit.current()->file()).exists() ) {
1018// qDebug(dit.current()->name()); 905 // qDebug(dit.current()->name());
1019 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(), 906 newItem= /*(void)*/ new QListViewItem( audioView, dit.current()->name(),
1020 QString::number( QFile( dit.current()->file()).size() ), storage); 907 QString::number( QFile( dit.current()->file()).size() ), storage);
1021 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" )); 908 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/musicfile" ));
1022 } 909 }
1023 } 910 }
1024 911
1025} 912}
1026 913
1027void PlayListWidget::populateVideoView() { 914void PlayListWidget::populateVideoView() {
1028 videoView->clear(); 915 videoView->clear();
1029 StorageInfo storageInfo; 916 StorageInfo storageInfo;
1030 const QList<FileSystem> &fs = storageInfo.fileSystems(); 917 const QList<FileSystem> &fs = storageInfo.fileSystems();
1031 918
1032 if(!videoScan ) scanForVideo(); 919 if(!videoScan ) scanForVideo();
1033 920
1034 QListIterator<DocLnk> Vdit( vFiles.children() ); 921 QListIterator<DocLnk> Vdit( vFiles.children() );
1035 QListIterator<FileSystem> it ( fs ); 922 QListIterator<FileSystem> it ( fs );
1036 videoView->clear(); 923 videoView->clear();
1037 QString storage; 924 QString storage;
1038 for ( ; Vdit.current(); ++Vdit ) { 925 for ( ; Vdit.current(); ++Vdit ) {
1039 for( ; it.current(); ++it ){ 926 for( ; it.current(); ++it ){
1040 const QString name = (*it)->name(); 927 const QString name = (*it)->name();
1041 const QString path = (*it)->path(); 928 const QString path = (*it)->path();
1042 if( Vdit.current()->file().find(path) != -1 ) storage=name; 929 if( Vdit.current()->file().find(path) != -1 ) storage=name;
1043 } 930 }
1044 931
1045 QListViewItem * newItem; 932 QListViewItem * newItem;
1046 if ( QFile( Vdit.current()->file()).exists() ) { 933 if ( QFile( Vdit.current()->file()).exists() ) {
1047 newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(), 934 newItem= /*(void)*/ new QListViewItem( videoView, Vdit.current()->name(),
1048 QString::number( QFile( Vdit.current()->file()).size() ), storage); 935 QString::number( QFile( Vdit.current()->file()).size() ), storage);
1049 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" )); 936 newItem->setPixmap(0, Resource::loadPixmap( "opieplayer/videofile" ));
1050 } 937 }
1051 } 938 }
1052} 939}
1053 940
1054void PlayListWidget::openFile() { 941void PlayListWidget::openFile() {
1055 QString filename, name; 942 QString filename, name;
1056 InputDialog *fileDlg; 943 InputDialog *fileDlg;
1057 fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0); 944 fileDlg = new InputDialog(this,tr("Open file or URL"),TRUE, 0);
1058 fileDlg->exec(); 945 fileDlg->exec();
1059 if( fileDlg->result() == 1 ) { 946 if( fileDlg->result() == 1 ) {
1060 filename = fileDlg->LineEdit1->text(); 947 filename = fileDlg->LineEdit1->text();
1061// http://205.188.234.129:8030 948
1062// http://66.28.68.70:8000 949 qDebug("Selected filename is "+filename);
1063// filename.replace(QRegExp("%20")," "); 950 if(filename.right(3) == "m3u") {
1064 if(filename.find(" ",0,TRUE) != -1 || filename.find("%20",0,TRUE) != -1) { 951 readm3u( filename );
1065 QMessageBox::message("Note","Spaces in urls are not allowed."); 952 } else if(filename.right(3) == "pls") {
1066 return; 953 readPls( filename );
1067 } else { 954 } else {
1068 qDebug("Selected filename is "+filename); 955 DocLnk lnk;
1069 if(filename.right(3) == "m3u")
1070 readm3u( filename);
1071 else if(filename.right(3) == "pls")
1072 readPls( filename);
1073 else {
1074 DocLnk lnk;
1075
1076 lnk.setName(filename); //sets file name
1077 if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3")
1078 filename += "/";
1079 lnk.setFile(filename); //sets File property
1080 956
1081 lnk.setType("audio/x-mpegurl"); 957 lnk.setName(filename); //sets file name
1082 lnk.setExec("opieplayer"); 958 // probably not needed anymore either
1083 lnk.setIcon("opieplayer/MPEGPlayer"); 959 if(filename.right(1) != "/" && filename.right(3) != "mp3" && filename.right(3) != "MP3") {
960 filename += "/";
961 }
962 lnk.setFile(filename); //sets File property
963
964 lnk.setType("audio/x-mpegurl");
965 lnk.setExec("opieplayer");
966 lnk.setIcon("opieplayer/MPEGPlayer");
1084 967
1085 if(!lnk.writeLink()) 968 if(!lnk.writeLink()) {
1086 qDebug("Writing doclink did not work"); 969 qDebug("Writing doclink did not work");
1087 d->selectedFiles->addToSelection( lnk);
1088// if(fileDlg2)
1089// delete fileDlg2;
1090 } 970 }
971 d->selectedFiles->addToSelection( lnk);
1091 } 972 }
1092 } 973 }
1093 if(fileDlg) 974 if(fileDlg) {
1094 delete fileDlg; 975 delete fileDlg;
976 }
1095} 977}
1096 978
1097void PlayListWidget::keyReleaseEvent( QKeyEvent *e) 979void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
1098{ 980{
1099 switch ( e->key() ) { 981 switch ( e->key() ) {
1100////////////////////////////// Zaurus keys 982////////////////////////////// Zaurus keys
1101 case Key_F9: //activity 983 case Key_F9: //activity
1102// if(audioUI->isHidden()) 984// if(audioUI->isHidden())
1103// audioUI->showMaximized(); 985// audioUI->showMaximized();
1104 break; 986 break;
1105 case Key_F10: //contacts 987 case Key_F10: //contacts
1106// if( videoUI->isHidden()) 988// if( videoUI->isHidden())
1107// videoUI->showMaximized(); 989// videoUI->showMaximized();
1108 break; 990 break;
1109 case Key_F11: //menu 991 case Key_F11: //menu
1110 break; 992 break;
1111 case Key_F12: //home 993 case Key_F12: //home
1112// doBlank(); 994// doBlank();
1113 break; 995 break;
1114 case Key_F13: //mail 996 case Key_F13: //mail
1115// doUnblank(); 997// doUnblank();
1116 break; 998 break;
1117 case Key_Q: //add to playlist 999 case Key_Q: //add to playlist
1118 qDebug("Add"); 1000 qDebug("Add");
1119 addSelected(); 1001 addSelected();
1120 break; 1002 break;
1121 case Key_R: //remove from playlist 1003 case Key_R: //remove from playlist
1122 removeSelected(); 1004 removeSelected();
1123 break; 1005 break;
1124// case Key_P: //play 1006// case Key_P: //play
1125// qDebug("Play"); 1007// qDebug("Play");
1126// playSelected(); 1008// playSelected();
@@ -1159,190 +1041,177 @@ void PlayListWidget::keyPressEvent( QKeyEvent *e)
1159{ 1041{
1160// qDebug("Key press"); 1042// qDebug("Key press");
1161// switch ( e->key() ) { 1043// switch ( e->key() ) {
1162// ////////////////////////////// Zaurus keys 1044// ////////////////////////////// Zaurus keys
1163// case Key_A: //add to playlist 1045// case Key_A: //add to playlist
1164// qDebug("Add"); 1046// qDebug("Add");
1165// addSelected(); 1047// addSelected();
1166// break; 1048// break;
1167// case Key_R: //remove from playlist 1049// case Key_R: //remove from playlist
1168// removeSelected(); 1050// removeSelected();
1169// break; 1051// break;
1170// case Key_P: //play 1052// case Key_P: //play
1171// qDebug("Play"); 1053// qDebug("Play");
1172// playSelected(); 1054// playSelected();
1173// break; 1055// break;
1174// case Key_Space: 1056// case Key_Space:
1175// qDebug("Play"); 1057// qDebug("Play");
1176// playSelected(); 1058// playSelected();
1177// break; 1059// break;
1178// } 1060// }
1179} 1061}
1180 1062
1181void PlayListWidget::doBlank() { 1063void PlayListWidget::doBlank() {
1182 qDebug("do blanking"); 1064 qDebug("do blanking");
1183 fd=open("/dev/fb0",O_RDWR); 1065 fd=open("/dev/fb0",O_RDWR);
1184 if (fd != -1) { 1066 if (fd != -1) {
1185 ioctl(fd,FBIOBLANK,1); 1067 ioctl(fd,FBIOBLANK,1);
1186// close(fd); 1068// close(fd);
1187 } 1069 }
1188} 1070}
1189 1071
1190void PlayListWidget::doUnblank() { 1072void PlayListWidget::doUnblank() {
1191 // this crashes opieplayer with a segfault 1073 // this crashes opieplayer with a segfault
1192// int fd; 1074 // int fd;
1193// fd=open("/dev/fb0",O_RDWR); 1075 // fd=open("/dev/fb0",O_RDWR);
1194 qDebug("do unblanking"); 1076 qDebug("do unblanking");
1195 if (fd != -1) { 1077 if (fd != -1) {
1196 ioctl(fd,FBIOBLANK,0); 1078 ioctl(fd,FBIOBLANK,0);
1197 close(fd); 1079 close(fd);
1198 } 1080 }
1199 QCopEnvelope h("QPE/System", "setBacklight(int)"); 1081 QCopEnvelope h("QPE/System", "setBacklight(int)");
1200 h <<-3;// v[1]; // -3 Force on 1082 h <<-3;// v[1]; // -3 Force on
1201} 1083}
1202 1084
1203void PlayListWidget::readm3u(const QString &filename) { 1085void PlayListWidget::readm3u(const QString &filename) {
1204 1086
1205 qDebug("m3u filename is "+filename); 1087 qDebug("m3u filename is "+filename);
1206 QFile f(filename); 1088 QFile f(filename);
1207 1089
1208 if(f.open(IO_ReadOnly)) { 1090 if(f.open(IO_ReadOnly)) {
1209 QTextStream t(&f); 1091 QTextStream t(&f);
1210 QString s;//, first, second; 1092 QString s;//, first, second;
1211 int i=0; 1093 int i=0;
1212 while ( !t.atEnd()) { 1094 while ( !t.atEnd()) {
1213// Lview->insertLine(t.readLine(),-1);
1214 s=t.readLine(); 1095 s=t.readLine();
1215 if(s.find(" ",0,TRUE) != -1 || s.find("%20",0,TRUE) != -1) { 1096
1216 QMessageBox::message("Note","Spaces in urls are not allowed."); 1097 if(s.find("#",0,TRUE) == -1) {
1217 }
1218 else if(s.find("#",0,TRUE) == -1) {
1219 if(s.find(" ",0,TRUE) == -1) { // not sure if this is neede since cf uses vfat 1098 if(s.find(" ",0,TRUE) == -1) { // not sure if this is neede since cf uses vfat
1220 if(s.left(2) == "E:" || s.left(2) == "P:") { 1099 if(s.left(2) == "E:" || s.left(2) == "P:") {
1221 s=s.right(s.length()-2); 1100 s=s.right(s.length()-2);
1222 DocLnk lnk( s ); 1101 DocLnk lnk( s );
1223 QFileInfo f(s); 1102 QFileInfo f(s);
1224 QString name = f.baseName(); 1103 QString name = f.baseName();
1225 name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1); 1104 name = name.right( name.length()-name.findRev( "\\",-1,TRUE ) -1 );
1226 lnk.setName( name); 1105 lnk.setName( name );
1227 s=s.replace( QRegExp("\\"),"/"); 1106 s=s.replace( QRegExp("\\"),"/");
1228 lnk.setFile( s); 1107 lnk.setFile( s );
1229 lnk.writeLink(); 1108 lnk.writeLink();
1230// lnk.setIcon(opieplayer/MPEGPlayer);
1231 qDebug("add "+name); 1109 qDebug("add "+name);
1232 d->selectedFiles->addToSelection( lnk); 1110 d->selectedFiles->addToSelection( lnk);
1233 } else { // is url 1111 } else { // is url
1234
1235 s.replace(QRegExp("%20")," "); 1112 s.replace(QRegExp("%20")," ");
1236 DocLnk lnk( s); 1113 DocLnk lnk( s );
1237 QString name; 1114 QString name;
1238 if(name.left(4)=="http") 1115 if(name.left(4)=="http") {
1239 name = s.right( s.length() - 7); 1116 name = s.right( s.length() - 7);
1240 else 1117 } else {
1241 name=s; 1118 name = s;
1242// name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1); 1119 }
1243 lnk.setName(name); 1120 lnk.setName(name);
1244 if(s.at(s.length()-4) == '.') 1121 if(s.at(s.length()-4) == '.') {
1245 lnk.setFile( s); 1122 lnk.setFile( s);
1246 else 1123 } else {
1247 lnk.setFile( s+"/"); 1124 lnk.setFile( s+"/");
1248// lnk.setFile( filename); 1125 }
1249// lnk.setComment( s+"/");
1250 lnk.setType("audio/x-mpegurl"); 1126 lnk.setType("audio/x-mpegurl");
1251 lnk.writeLink(); 1127 lnk.writeLink();
1252// lnk.setIcon( "opieplayer/MPEGPlayer");
1253// qDebug("add "+s);
1254 d->selectedFiles->addToSelection( lnk); 1128 d->selectedFiles->addToSelection( lnk);
1255 } 1129 }
1256 i++; 1130 i++;
1257 } 1131 }
1258 } 1132 }
1259 } 1133 }
1260 } 1134 }
1261 f.close(); 1135 f.close();
1262} 1136}
1263 1137
1264void PlayListWidget::writem3u() { 1138void PlayListWidget::writem3u() {
1265 1139
1266 InputDialog *fileDlg; 1140 InputDialog *fileDlg;
1267 fileDlg = new InputDialog(this,tr("Save m3u Playlist "),TRUE, 0); 1141 fileDlg = new InputDialog(this,tr("Save m3u Playlist "),TRUE, 0);
1268 fileDlg->exec(); 1142 fileDlg->exec();
1269 QString filename,list; 1143 QString filename,list;
1270 if( fileDlg->result() == 1 ) { 1144 if( fileDlg->result() == 1 ) {
1271 filename = fileDlg->LineEdit1->text(); 1145 filename = fileDlg->LineEdit1->text();
1272 qDebug(filename); 1146 qDebug(filename);
1273 int noOfFiles = 0; 1147 int noOfFiles = 0;
1274 d->selectedFiles->first(); 1148 d->selectedFiles->first();
1275 do { 1149 do {
1276// we dont check for existance because of url's 1150 // we dont check for existance because of url's
1277// qDebug(d->selectedFiles->current()->file()); 1151 // qDebug(d->selectedFiles->current()->file());
1278 list += d->selectedFiles->current()->file()+"\n"; 1152 list += d->selectedFiles->current()->file()+"\n";
1279 noOfFiles++; 1153 noOfFiles++;
1280 } 1154 }
1281 while ( d->selectedFiles->next() ); 1155 while ( d->selectedFiles->next() );
1282 qDebug(list); 1156 qDebug(list);
1283 if(filename.left(1) != "/") 1157 if(filename.left(1) != "/")
1284 filename=QPEApplication::documentDir()+"/"+filename; 1158 filename=QPEApplication::documentDir()+"/"+filename;
1285 if(filename.right(3) != "m3u") 1159 if(filename.right(3) != "m3u")
1286 filename=filename+".m3u"; 1160 filename=filename+".m3u";
1287 1161
1288 QFile f(filename); 1162 QFile f(filename);
1289 f.open(IO_WriteOnly); 1163 f.open(IO_WriteOnly);
1290 f.writeBlock(list, list.length()); 1164 f.writeBlock(list, list.length());
1291 f.close(); 1165 f.close();
1292 } 1166 }
1293 if(fileDlg) delete fileDlg; 1167 if(fileDlg) delete fileDlg;
1294} 1168}
1295 1169
1296void PlayListWidget::readPls(const QString &filename) { 1170void PlayListWidget::readPls(const QString &filename) {
1297 1171
1298 qDebug("pls filename is "+filename); 1172 qDebug("pls filename is "+filename);
1299 QFile f(filename); 1173 QFile f(filename);
1300 1174
1301 if(f.open(IO_ReadOnly)) { 1175 if(f.open(IO_ReadOnly)) {
1302 QTextStream t(&f); 1176 QTextStream t(&f);
1303 QString s;//, first, second; 1177 QString s;//, first, second;
1304 int i=0; 1178 int i=0;
1305 while ( !t.atEnd()) { 1179 while ( !t.atEnd()) {
1306 s=t.readLine(); 1180 s=t.readLine();
1307 if(s.left(4) == "File") { 1181 if(s.left(4) == "File") {
1308 s=s.right(s.length() - 6); 1182 s=s.right(s.length() - 6);
1309 s.replace(QRegExp("%20")," "); 1183 s.replace(QRegExp("%20")," ");
1310 qDebug("adding "+s+" to playlist"); 1184 qDebug("adding "+s+" to playlist");
1311// numberofentries=2 1185 // numberofentries=2
1312// File1=http 1186 // File1=http
1313// Title 1187 // Title
1314// Length 1188 // Length
1315// Version 1189 // Version
1316// File2=http 1190 // File2=http
1317
1318 s=s.replace( QRegExp("\\"),"/"); 1191 s=s.replace( QRegExp("\\"),"/");
1319 DocLnk lnk( s ); 1192 DocLnk lnk( s );
1320 QFileInfo f(s); 1193 QFileInfo f(s);
1321 QString name = f.baseName(); 1194 QString name = f.baseName();
1322 if(name.left(4)=="http") 1195 if(name.left(4)=="http")
1323 name = s.right( s.length() - 7); 1196 name = s.right( s.length() - 7);
1324 else 1197 else
1325 name=s; 1198 name=s;
1326 name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1); 1199 name = name.right(name.length()-name.findRev("\\",-1,TRUE)-1);
1327// QFileInfo f(s);
1328// QString name = f.baseName();
1329// name = name.left(name.length()-4);
1330// name = name.right(name.findRev("/",0,TRUE));
1331 lnk.setName( name); 1200 lnk.setName( name);
1332 if(s.at(s.length()-4) == '.') // if this is probably a file 1201 if(s.at(s.length()-4) == '.') // if this is probably a file
1333 lnk.setFile( s); 1202 lnk.setFile( s);
1334 else { //if its a url 1203 else { //if its a url
1335 if( name.right(1).find('/') == -1) 1204 if( name.right(1).find('/') == -1)
1336 s+="/"; 1205 s+="/";
1337 lnk.setFile( s); 1206 lnk.setFile( s);
1338 } 1207 }
1339 lnk.setType("audio/x-mpegurl"); 1208 lnk.setType("audio/x-mpegurl");
1340 1209
1341 qDebug("DocLnk add "+name); 1210 qDebug("DocLnk add "+name);
1342 d->selectedFiles->addToSelection( lnk); 1211 d->selectedFiles->addToSelection( lnk);
1343 } 1212 }
1344 } 1213 }
1345 i++; 1214 i++;
1346 } 1215 }
1347} 1216}
1348 1217
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
@@ -1,62 +1,70 @@
1 1
2#include "xinecontrol.h" 2#include "xinecontrol.h"
3#include "mediaplayerstate.h" 3#include "mediaplayerstate.h"
4 4
5
5extern MediaPlayerState *mediaPlayerState; 6extern MediaPlayerState *mediaPlayerState;
6 7
7XineControl::XineControl( QObject *parent, const char *name ) 8XineControl::XineControl( QObject *parent, const char *name )
8 : QObject( parent, name ) { 9 : QObject( parent, name ) {
9 libXine = new XINE::Lib(); 10 libXine = new XINE::Lib();
10 11
11 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) ); 12 connect( mediaPlayerState, SIGNAL( pausedToggled(bool) ), this, SLOT( pause(bool) ) );
12 connect( this, SIGNAL( positionChanged( int position ) ), mediaPlayerState, SLOT( updatePosition( long p ) ) ); 13 connect( this, SIGNAL( positionChanged( int position ) ), mediaPlayerState, SLOT( updatePosition( long p ) ) );
13 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) ); 14 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( stop( bool ) ) );
14 15
15} 16}
16 17
17XineControl::~XineControl() { 18XineControl::~XineControl() {
18 delete libXine; 19 delete libXine;
19} 20}
20 21
21void XineControl::play( const QString& fileName ) { 22void XineControl::play( const QString& fileName ) {
22 libXine->play( fileName ); 23 libXine->play( fileName );
23 mediaPlayerState->setPlaying( true ); 24 mediaPlayerState->setPlaying( true );
24 // default to audio view until we know how to handle video 25 // default to audio view until we know how to handle video
25 mediaPlayerState->setView('a'); 26 // MediaDetect mdetect;
26 // determines of slider is shown 27 char whichGui = mdetect.videoOrAudio( fileName );
27 // mediaPlayerState->setIsStreaming( false ); 28 if (whichGui == 'f') {
28 // hier dann schaun welcher view 29 qDebug("Nicht erkannter Dateityp");
30 return;
31 }
32
33 // which gui (video / audio)
34 mediaPlayerState->setView( whichGui );
35
36 // determine if slider is shown
37 mediaPlayerState->setIsStreaming( mdetect.isStreaming( fileName ) );
29} 38}
30 39
31void XineControl::stop( bool isSet ) { 40void XineControl::stop( bool isSet ) {
32 if ( !isSet) { 41 if ( !isSet) {
33 libXine->stop(); 42 libXine->stop();
34 mediaPlayerState->setNext(); 43 mediaPlayerState->setList();
35 //mediaPlayerState->setPlaying( false ); 44 //mediaPlayerState->setPlaying( false );
36 } else { 45 } else {
37 // play again 46 // play again
38 } 47 }
39} 48}
40 49
41void XineControl::pause( bool isSet) { 50void XineControl::pause( bool isSet) {
42
43 libXine->pause(); 51 libXine->pause();
44} 52}
45 53
46int XineControl::currentTime() { 54int XineControl::currentTime() {
47 // todo: jede sekunde überprüfen 55 // todo: jede sekunde überprüfen
48 m_currentTime = libXine->currentTime(); 56 m_currentTime = libXine->currentTime();
49 return m_currentTime; 57 return m_currentTime;
50} 58}
51 59
52void XineControl::length() { 60void XineControl::length() {
53 m_length = libXine->length(); 61 m_length = libXine->length();
54 mediaPlayerState->setLength( m_length ); 62 mediaPlayerState->setLength( m_length );
55} 63}
56 64
57int XineControl::position() { 65int XineControl::position() {
58 m_position = (m_currentTime/m_length*100); 66 m_position = (m_currentTime/m_length*100);
59 mediaPlayerState->setPosition( m_position ); 67 mediaPlayerState->setPosition( m_position );
60 return m_position; 68 return m_position;
61 emit positionChanged( m_position ); 69 emit positionChanged( m_position );
62} 70}
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
@@ -1,38 +1,40 @@
1 1
2#ifndef XINECONTROL_H 2#ifndef XINECONTROL_H
3#define XINECONTROL_H 3#define XINECONTROL_H
4 4
5#include "lib.h" 5#include "lib.h"
6#include "mediadetect.h"
6#include <qobject.h> 7#include <qobject.h>
7 8
8class XineControl : public QObject { 9class XineControl : public QObject {
9 Q_OBJECT 10 Q_OBJECT
10public: 11public:
11 XineControl( QObject *parent = 0, const char *name =0 ); 12 XineControl( QObject *parent = 0, const char *name =0 );
12 ~XineControl(); 13 ~XineControl();
13 14
14public slots: 15public slots:
15 void play( const QString& fileName ); 16 void play( const QString& fileName );
16 void stop( bool ); 17 void stop( bool );
17 void pause( bool ); 18 void pause( bool );
18 19
19 int currentTime(); 20 int currentTime();
20 21
21 // get length of media file and set it 22 // get length of media file and set it
22 void length(); 23 void length();
23 24
24 int position(); 25 int position();
25 26
26private: 27private:
27 XINE::Lib *libXine; 28 XINE::Lib *libXine;
29 MediaDetect mdetect;
28 int m_length; 30 int m_length;
29 int m_currentTime; 31 int m_currentTime;
30 int m_position; 32 int m_position;
31 33
32signals: 34signals:
33 void positionChanged( int position ); 35 void positionChanged( int position );
34 36
35}; 37};
36 38
37 39
38#endif 40#endif