-rw-r--r-- | core/multimedia/opieplayer/audiodevice.cpp | 1 | ||||
-rw-r--r-- | core/multimedia/opieplayer/audiowidget.cpp | 6 | ||||
-rw-r--r-- | core/multimedia/opieplayer/mediaplayer.cpp | 7 | ||||
-rw-r--r-- | core/multimedia/opieplayer/mediaplayerstate.cpp | 2 | ||||
-rw-r--r-- | core/multimedia/opieplayer/modplug/load_j2b.cpp | 1 | ||||
-rw-r--r-- | core/multimedia/opieplayer/om3u.cpp | 15 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistselection.cpp | 8 | ||||
-rw-r--r-- | core/multimedia/opieplayer/playlistwidget.cpp | 25 | ||||
-rw-r--r-- | core/multimedia/opieplayer/videowidget.cpp | 4 |
9 files changed, 1 insertions, 68 deletions
diff --git a/core/multimedia/opieplayer/audiodevice.cpp b/core/multimedia/opieplayer/audiodevice.cpp index d296d27..355062b 100644 --- a/core/multimedia/opieplayer/audiodevice.cpp +++ b/core/multimedia/opieplayer/audiodevice.cpp | |||
@@ -15,25 +15,24 @@ | |||
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // L.J.Potter added better error code Fri 02-15-2002 14:37:47 | 20 | // L.J.Potter added better error code Fri 02-15-2002 14:37:47 |
21 | 21 | ||
22 | 22 | ||
23 | #include <stdlib.h> | 23 | #include <stdlib.h> |
24 | #include <stdio.h> | 24 | #include <stdio.h> |
25 | #include <qpe/qpeapplication.h> | 25 | #include <qpe/qpeapplication.h> |
26 | #include <qpe/config.h> | 26 | #include <qpe/config.h> |
27 | #include <qpe/custom.h> | ||
28 | #include <qmessagebox.h> | 27 | #include <qmessagebox.h> |
29 | 28 | ||
30 | #include "audiodevice.h" | 29 | #include "audiodevice.h" |
31 | 30 | ||
32 | 31 | ||
33 | #include <errno.h> | 32 | #include <errno.h> |
34 | 33 | ||
35 | #if !defined(QT_NO_COP) | 34 | #if !defined(QT_NO_COP) |
36 | #include <qpe/qcopenvelope_qws.h> | 35 | #include <qpe/qcopenvelope_qws.h> |
37 | #endif | 36 | #endif |
38 | 37 | ||
39 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) | 38 | #if defined(Q_WS_X11) || defined(Q_WS_QWS) |
diff --git a/core/multimedia/opieplayer/audiowidget.cpp b/core/multimedia/opieplayer/audiowidget.cpp index fbc5072..8bcc567 100644 --- a/core/multimedia/opieplayer/audiowidget.cpp +++ b/core/multimedia/opieplayer/audiowidget.cpp | |||
@@ -12,30 +12,24 @@ | |||
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
21 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
22 | #include <qpe/config.h> | 22 | #include <qpe/config.h> |
23 | 23 | ||
24 | #include <qwidget.h> | ||
25 | #include <qpixmap.h> | ||
26 | #include <qbutton.h> | ||
27 | #include <qpainter.h> | ||
28 | #include <qframe.h> | ||
29 | #include <qlayout.h> | ||
30 | #include <qdir.h> | 24 | #include <qdir.h> |
31 | #include "audiowidget.h" | 25 | #include "audiowidget.h" |
32 | #include "mediaplayerstate.h" | 26 | #include "mediaplayerstate.h" |
33 | 27 | ||
34 | #include <stdlib.h> | 28 | #include <stdlib.h> |
35 | #include <stdio.h> | 29 | #include <stdio.h> |
36 | 30 | ||
37 | extern MediaPlayerState *mediaPlayerState; | 31 | extern MediaPlayerState *mediaPlayerState; |
38 | 32 | ||
39 | 33 | ||
40 | static const int xo = -2; // movable x offset | 34 | static const int xo = -2; // movable x offset |
41 | static const int yo = 22; // movable y offset | 35 | static const int yo = 22; // movable y offset |
diff --git a/core/multimedia/opieplayer/mediaplayer.cpp b/core/multimedia/opieplayer/mediaplayer.cpp index 753b2e3..b77708c 100644 --- a/core/multimedia/opieplayer/mediaplayer.cpp +++ b/core/multimedia/opieplayer/mediaplayer.cpp | |||
@@ -9,33 +9,26 @@ | |||
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include <qpe/qpeapplication.h> | ||
22 | #include <qpe/qlibrary.h> | ||
23 | #include <qpe/resource.h> | ||
24 | #include <qpe/config.h> | ||
25 | 21 | ||
26 | #include <qmainwindow.h> | ||
27 | #include <qmessagebox.h> | 22 | #include <qmessagebox.h> |
28 | #include <qwidgetstack.h> | ||
29 | #include <qfile.h> | ||
30 | 23 | ||
31 | #include "mediaplayer.h" | 24 | #include "mediaplayer.h" |
32 | #include "playlistwidget.h" | 25 | #include "playlistwidget.h" |
33 | #include "audiowidget.h" | 26 | #include "audiowidget.h" |
34 | #include "loopcontrol.h" | 27 | #include "loopcontrol.h" |
35 | #include "audiodevice.h" | 28 | #include "audiodevice.h" |
36 | 29 | ||
37 | #include "mediaplayerstate.h" | 30 | #include "mediaplayerstate.h" |
38 | 31 | ||
39 | 32 | ||
40 | extern AudioWidget *audioUI; | 33 | extern AudioWidget *audioUI; |
41 | extern PlayListWidget *playList; | 34 | extern PlayListWidget *playList; |
diff --git a/core/multimedia/opieplayer/mediaplayerstate.cpp b/core/multimedia/opieplayer/mediaplayerstate.cpp index 6823076..5bfb87e 100644 --- a/core/multimedia/opieplayer/mediaplayerstate.cpp +++ b/core/multimedia/opieplayer/mediaplayerstate.cpp | |||
@@ -11,26 +11,24 @@ | |||
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qpe/qpeapplication.h> | 20 | #include <qpe/qpeapplication.h> |
21 | #include <qpe/qlibrary.h> | 21 | #include <qpe/qlibrary.h> |
22 | #include <qpe/config.h> | 22 | #include <qpe/config.h> |
23 | #include <qvaluelist.h> | ||
24 | #include <qobject.h> | ||
25 | #include <qdir.h> | 23 | #include <qdir.h> |
26 | #include <qpe/mediaplayerplugininterface.h> | 24 | #include <qpe/mediaplayerplugininterface.h> |
27 | #include "mediaplayerstate.h" | 25 | #include "mediaplayerstate.h" |
28 | 26 | ||
29 | 27 | ||
30 | 28 | ||
31 | #ifdef QT_NO_COMPONENT | 29 | #ifdef QT_NO_COMPONENT |
32 | // Plugins which are compiled in when no plugin architecture available | 30 | // Plugins which are compiled in when no plugin architecture available |
33 | #include "libmad/libmadpluginimpl.h" | 31 | #include "libmad/libmadpluginimpl.h" |
34 | #include "libmpeg3/libmpeg3pluginimpl.h" | 32 | #include "libmpeg3/libmpeg3pluginimpl.h" |
35 | #include "wavplugin/wavpluginimpl.h" | 33 | #include "wavplugin/wavpluginimpl.h" |
36 | #endif | 34 | #endif |
diff --git a/core/multimedia/opieplayer/modplug/load_j2b.cpp b/core/multimedia/opieplayer/modplug/load_j2b.cpp index 4f0b85c..8b4cccd 100644 --- a/core/multimedia/opieplayer/modplug/load_j2b.cpp +++ b/core/multimedia/opieplayer/modplug/load_j2b.cpp | |||
@@ -4,14 +4,13 @@ | |||
4 | * Free Software Foundation; either version 2 of the license or (at your | 4 | * Free Software Foundation; either version 2 of the license or (at your |
5 | * option) any later version. | 5 | * option) any later version. |
6 | * | 6 | * |
7 | * Authors: Olivier Lapicque <olivierl@jps.net> | 7 | * Authors: Olivier Lapicque <olivierl@jps.net> |
8 | */ | 8 | */ |
9 | 9 | ||
10 | 10 | ||
11 | /////////////////////////////////////////////////// | 11 | /////////////////////////////////////////////////// |
12 | // | 12 | // |
13 | // J2B module loader | 13 | // J2B module loader |
14 | // | 14 | // |
15 | /////////////////////////////////////////////////// | 15 | /////////////////////////////////////////////////// |
16 | #include "stdafx.h" | ||
17 | 16 | ||
diff --git a/core/multimedia/opieplayer/om3u.cpp b/core/multimedia/opieplayer/om3u.cpp index 778eb22..ae89518 100644 --- a/core/multimedia/opieplayer/om3u.cpp +++ b/core/multimedia/opieplayer/om3u.cpp | |||
@@ -20,40 +20,27 @@ | |||
20 | ..}^=.= = ; General Public License for more | 20 | ..}^=.= = ; General Public License for more |
21 | ++= -. .` .: details. | 21 | ++= -. .` .: details. |
22 | : = ...= . :.=- | 22 | : = ...= . :.=- |
23 | -. .:....=;==+<; You should have received a copy of the GNU | 23 | -. .:....=;==+<; You should have received a copy of the GNU |
24 | -_. . . )=. = General Public License along with | 24 | -_. . . )=. = General Public License along with |
25 | -- :-=` this library; see the file COPYING.LIB. | 25 | -- :-=` this library; see the file COPYING.LIB. |
26 | If not, write to the Free Software Foundation, | 26 | If not, write to the Free Software Foundation, |
27 | Inc., 59 Temple Place - Suite 330, | 27 | Inc., 59 Temple Place - Suite 330, |
28 | Boston, MA 02111-1307, USA. | 28 | Boston, MA 02111-1307, USA. |
29 | 29 | ||
30 | */ | 30 | */ |
31 | 31 | ||
32 | #include "playlistwidget.h" | ||
33 | #include "om3u.h" | 32 | #include "om3u.h" |
34 | 33 | ||
35 | #include <qpe/applnk.h> | 34 | |
36 | #include <qpe/qpeapplication.h> | ||
37 | #include <qpe/storage.h> | ||
38 | #include <qpe/mimetype.h> | ||
39 | #include <qpe/global.h> | ||
40 | #include <qpe/resource.h> | ||
41 | |||
42 | #include <qdir.h> | ||
43 | #include <qregexp.h> | ||
44 | #include <qstring.h> | ||
45 | #include <qtextstream.h> | ||
46 | #include <qstringlist.h> | ||
47 | #include <qcstring.h> | ||
48 | 35 | ||
49 | static inline QString fullBaseName ( const QFileInfo &fi ) | 36 | static inline QString fullBaseName ( const QFileInfo &fi ) |
50 | { | 37 | { |
51 | QString str = fi. fileName ( ); | 38 | QString str = fi. fileName ( ); |
52 | return str. left ( str. findRev ( '.' )); | 39 | return str. left ( str. findRev ( '.' )); |
53 | } | 40 | } |
54 | 41 | ||
55 | 42 | ||
56 | //extern PlayListWidget *playList; | 43 | //extern PlayListWidget *playList; |
57 | 44 | ||
58 | Om3u::Om3u( const QString &filePath, int mode) | 45 | Om3u::Om3u( const QString &filePath, int mode) |
59 | : QStringList (){ | 46 | : QStringList (){ |
diff --git a/core/multimedia/opieplayer/playlistselection.cpp b/core/multimedia/opieplayer/playlistselection.cpp index 94567f2..ad831cf 100644 --- a/core/multimedia/opieplayer/playlistselection.cpp +++ b/core/multimedia/opieplayer/playlistselection.cpp | |||
@@ -8,34 +8,26 @@ | |||
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qpe/applnk.h> | ||
21 | #include <qpe/resource.h> | ||
22 | #include <qpe/config.h> | ||
23 | 20 | ||
24 | #include <qpainter.h> | ||
25 | #include <qimage.h> | ||
26 | #include <qheader.h> | 21 | #include <qheader.h> |
27 | #include <qlistview.h> | ||
28 | #include <qlist.h> | ||
29 | #include <qpixmap.h> | ||
30 | 22 | ||
31 | #include "playlistselection.h" | 23 | #include "playlistselection.h" |
32 | 24 | ||
33 | #include <stdlib.h> | 25 | #include <stdlib.h> |
34 | 26 | ||
35 | class PlayListSelectionItem : public QListViewItem { | 27 | class PlayListSelectionItem : public QListViewItem { |
36 | public: | 28 | public: |
37 | PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) { | 29 | PlayListSelectionItem( QListView *parent, const DocLnk *f ) : QListViewItem( parent ), fl( f ) { |
38 | setText( 0, f->name() ); | 30 | setText( 0, f->name() ); |
39 | setPixmap( 0, f->pixmap() ); | 31 | setPixmap( 0, f->pixmap() ); |
40 | } | 32 | } |
41 | 33 | ||
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp index db99866..a359843 100644 --- a/core/multimedia/opieplayer/playlistwidget.cpp +++ b/core/multimedia/opieplayer/playlistwidget.cpp | |||
@@ -10,57 +10,32 @@ | |||
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | // code added by L. J. Potter Sat 03-02-2002 06:17:54 | 20 | // code added by L. J. Potter Sat 03-02-2002 06:17:54 |
21 | #define QTOPIA_INTERNAL_FSLP | 21 | #define QTOPIA_INTERNAL_FSLP |
22 | #include <qpe/qcopenvelope_qws.h> | ||
23 | 22 | ||
24 | #include <qmenubar.h> | ||
25 | #include <qtoolbar.h> | 23 | #include <qtoolbar.h> |
26 | #include <qpe/qpemenubar.h> | 24 | #include <qpe/qpemenubar.h> |
27 | #include <qpe/fileselector.h> | ||
28 | #include <qpe/qpeapplication.h> | ||
29 | #include <qpe/lnkproperties.h> | 25 | #include <qpe/lnkproperties.h> |
30 | #include <qpe/storage.h> | ||
31 | 26 | ||
32 | #include <qpe/applnk.h> | ||
33 | #include <qpe/config.h> | ||
34 | #include <qpe/global.h> | ||
35 | #include <qpe/resource.h> | ||
36 | #include <qaction.h> | 27 | #include <qaction.h> |
37 | #include <qcursor.h> | ||
38 | #include <qimage.h> | ||
39 | #include <qfile.h> | ||
40 | #include <qdir.h> | ||
41 | #include <qlayout.h> | 28 | #include <qlayout.h> |
42 | #include <qlabel.h> | ||
43 | #include <qlist.h> | ||
44 | #include <qlistbox.h> | ||
45 | #include <qmainwindow.h> | ||
46 | #include <qmessagebox.h> | 29 | #include <qmessagebox.h> |
47 | #include <qtoolbutton.h> | ||
48 | #include <qtabwidget.h> | ||
49 | #include <qlistview.h> | ||
50 | #include <qpoint.h> | ||
51 | #include <qlineedit.h> | ||
52 | #include <qpushbutton.h> | ||
53 | #include <qregexp.h> | ||
54 | #include <qtextstream.h> | ||
55 | 30 | ||
56 | //#include <qtimer.h> | 31 | //#include <qtimer.h> |
57 | 32 | ||
58 | #include "playlistselection.h" | 33 | #include "playlistselection.h" |
59 | #include "playlistwidget.h" | 34 | #include "playlistwidget.h" |
60 | #include "mediaplayerstate.h" | 35 | #include "mediaplayerstate.h" |
61 | 36 | ||
62 | #include "inputDialog.h" | 37 | #include "inputDialog.h" |
63 | 38 | ||
64 | #include <stdlib.h> | 39 | #include <stdlib.h> |
65 | #include "audiowidget.h" | 40 | #include "audiowidget.h" |
66 | #include "videowidget.h" | 41 | #include "videowidget.h" |
diff --git a/core/multimedia/opieplayer/videowidget.cpp b/core/multimedia/opieplayer/videowidget.cpp index 5273ad3..d002c42 100644 --- a/core/multimedia/opieplayer/videowidget.cpp +++ b/core/multimedia/opieplayer/videowidget.cpp | |||
@@ -14,29 +14,25 @@ | |||
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
16 | ** Contact info@trolltech.com if any conditions of this licensing are | 16 | ** Contact info@trolltech.com if any conditions of this licensing are |
17 | ** not clear to you. | 17 | ** not clear to you. |
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | #include <qpe/resource.h> | 20 | #include <qpe/resource.h> |
21 | #include <qpe/mediaplayerplugininterface.h> | 21 | #include <qpe/mediaplayerplugininterface.h> |
22 | #include <qpe/config.h> | 22 | #include <qpe/config.h> |
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | 24 | ||
25 | #include <qdir.h> | 25 | #include <qdir.h> |
26 | #include <qwidget.h> | ||
27 | #include <qpainter.h> | ||
28 | #include <qpixmap.h> | ||
29 | #include <qslider.h> | 26 | #include <qslider.h> |
30 | #include <qdrawutil.h> | ||
31 | #include "videowidget.h" | 27 | #include "videowidget.h" |
32 | #include "mediaplayerstate.h" | 28 | #include "mediaplayerstate.h" |
33 | 29 | ||
34 | 30 | ||
35 | #ifdef Q_WS_QWS | 31 | #ifdef Q_WS_QWS |
36 | # define USE_DIRECT_PAINTER | 32 | # define USE_DIRECT_PAINTER |
37 | # include <qdirectpainter_qws.h> | 33 | # include <qdirectpainter_qws.h> |
38 | # include <qgfxraster_qws.h> | 34 | # include <qgfxraster_qws.h> |
39 | #endif | 35 | #endif |
40 | 36 | ||
41 | 37 | ||
42 | extern MediaPlayerState *mediaPlayerState; | 38 | extern MediaPlayerState *mediaPlayerState; |