summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--core/multimedia/opieplayer/audiodevice.cpp1
-rw-r--r--core/multimedia/opieplayer/audiowidget.cpp6
-rw-r--r--core/multimedia/opieplayer/mediaplayer.cpp7
-rw-r--r--core/multimedia/opieplayer/mediaplayerstate.cpp2
-rw-r--r--core/multimedia/opieplayer/modplug/load_j2b.cpp1
-rw-r--r--core/multimedia/opieplayer/om3u.cpp15
-rw-r--r--core/multimedia/opieplayer/playlistselection.cpp8
-rw-r--r--core/multimedia/opieplayer/playlistwidget.cpp25
-rw-r--r--core/multimedia/opieplayer/videowidget.cpp4
-rw-r--r--core/opie-login/loginwindowimpl.cpp4
-rw-r--r--core/opie-login/main.cpp4
-rw-r--r--core/opie-login/opie-login.pro2
12 files changed, 2 insertions, 77 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
@@ -3,49 +3,48 @@
3 ** 3 **
4 ** This file is part of Qtopia Environment. 4 ** This file is part of Qtopia Environment.
5 ** 5 **
6 ** This file may be distributed and/or modified under the terms of the 6 ** This file may be distributed and/or modified under the terms of the
7 ** GNU General Public License version 2 as published by the Free Software 7 ** GNU General Public License version 2 as published by the Free Software
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// 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)
40#include <fcntl.h> 39#include <fcntl.h>
41#include <sys/ioctl.h> 40#include <sys/ioctl.h>
42#include <sys/soundcard.h> 41#include <sys/soundcard.h>
43#include <sys/stat.h> 42#include <sys/stat.h>
44#include <sys/time.h> 43#include <sys/time.h>
45#include <sys/types.h> 44#include <sys/types.h>
46#include <unistd.h> 45#include <unistd.h>
47#endif 46#endif
48 47
49#ifdef OPIE_SOUND_FRAGMENT_SHIFT 48#ifdef OPIE_SOUND_FRAGMENT_SHIFT
50static const int sound_fragment_shift = OPIE_SOUND_FRAGMENT_SHIFT; 49static const int sound_fragment_shift = OPIE_SOUND_FRAGMENT_SHIFT;
51#else 50#else
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
@@ -1,53 +1,47 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
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/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
37extern MediaPlayerState *mediaPlayerState; 31extern MediaPlayerState *mediaPlayerState;
38 32
39 33
40static const int xo = -2; // movable x offset 34static const int xo = -2; // movable x offset
41static const int yo = 22; // movable y offset 35static const int yo = 22; // movable y offset
42 36
43struct MediaButton { 37struct MediaButton {
44 bool isToggle, isHeld, isDown; 38 bool isToggle, isHeld, isDown;
45}; 39};
46 40
47//Layout information for the audioButtons (and if it is a toggle button or not) 41//Layout information for the audioButtons (and if it is a toggle button or not)
48MediaButton audioButtons[] = { 42MediaButton audioButtons[] = {
49 { TRUE, FALSE, FALSE }, // play 43 { TRUE, FALSE, FALSE }, // play
50 { FALSE, FALSE, FALSE }, // stop 44 { FALSE, FALSE, FALSE }, // stop
51 { FALSE, FALSE, FALSE }, // next 45 { FALSE, FALSE, FALSE }, // next
52 { FALSE, FALSE, FALSE }, // previous 46 { FALSE, FALSE, FALSE }, // previous
53 { FALSE, FALSE, FALSE }, // volume up 47 { FALSE, FALSE, FALSE }, // volume up
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
@@ -1,53 +1,46 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
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 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
40extern AudioWidget *audioUI; 33extern AudioWidget *audioUI;
41extern PlayListWidget *playList; 34extern PlayListWidget *playList;
42extern LoopControl *loopControl; 35extern LoopControl *loopControl;
43extern MediaPlayerState *mediaPlayerState; 36extern MediaPlayerState *mediaPlayerState;
44 37
45 38
46MediaPlayer::MediaPlayer( QObject *parent, const char *name ) 39MediaPlayer::MediaPlayer( QObject *parent, const char *name )
47 : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) { 40 : QObject( parent, name ), volumeDirection( 0 ), currentFile( NULL ) {
48 41
49// QPEApplication::grabKeyboard(); 42// QPEApplication::grabKeyboard();
50 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); 43 connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) );
51 44
52 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) ); 45 connect( mediaPlayerState, SIGNAL( playingToggled( bool ) ), this, SLOT( setPlaying( bool ) ) );
53 connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) ); 46 connect( mediaPlayerState, SIGNAL( pausedToggled( bool ) ), this, SLOT( pauseCheck( bool ) ) );
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
@@ -1,48 +1,46 @@
1/********************************************************************** 1/**********************************************************************
2 ** Copyright (C) 2000 Trolltech AS. All rights reserved. 2 ** Copyright (C) 2000 Trolltech AS. All rights reserved.
3 ** 3 **
4 ** This file is part of Qtopia Environment. 4 ** This file is part of Qtopia Environment.
5 ** 5 **
6 ** This file may be distributed and/or modified under the terms of the 6 ** This file may be distributed and/or modified under the terms of the
7 ** GNU General Public License version 2 as published by the Free Software 7 ** GNU General Public License version 2 as published by the Free Software
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/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
37 35
38 36
39//#define MediaPlayerDebug(x) qDebug x 37//#define MediaPlayerDebug(x) qDebug x
40#define MediaPlayerDebug(x) 38#define MediaPlayerDebug(x)
41 39
42 40
43MediaPlayerState::MediaPlayerState( QObject *parent, const char *name ) 41MediaPlayerState::MediaPlayerState( QObject *parent, const char *name )
44 : QObject( parent, name ), decoder( NULL ), libmpeg3decoder( NULL ) { 42 : QObject( parent, name ), decoder( NULL ), libmpeg3decoder( NULL ) {
45 Config cfg( "OpiePlayer" ); 43 Config cfg( "OpiePlayer" );
46 readConfig( cfg ); 44 readConfig( cfg );
47 loadPlugins(); 45 loadPlugins();
48} 46}
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
@@ -1,17 +1,16 @@
1/* 1/*
2 * This program is free software; you can redistribute it and modify it 2 * This program is free software; you can redistribute it and modify it
3 * under the terms of the GNU General Public License as published by the 3 * under the terms of the GNU General Public License as published by the
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
@@ -8,64 +8,51 @@
8 _;:,     .>    :=|. This program is free software; you can 8 _;:,     .>    :=|. This program is free software; you can
9.> <`_,   >  .   <= redistribute it and/or modify it under 9.> <`_,   >  .   <= redistribute it and/or modify it under
10:`=1 )Y*s>-.--   : the terms of the GNU General Public 10:`=1 )Y*s>-.--   : the terms of the GNU General Public
11.="- .-=="i,     .._ License as published by the Free Software 11.="- .-=="i,     .._ License as published by the Free Software
12 - .   .-<_>     .<> Foundation; either version 2 of the License, 12 - .   .-<_>     .<> Foundation; either version 2 of the License,
13     ._= =}       : or (at your option) any later version. 13     ._= =}       : or (at your option) any later version.
14    .%`+i>       _;_. 14    .%`+i>       _;_.
15    .i_,=:_.      -<s. This program is distributed in the hope that 15    .i_,=:_.      -<s. This program is distributed in the hope that
16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 16     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
17    : ..    .:,     . . . without even the implied warranty of 17    : ..    .:,     . . . without even the implied warranty of
18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 18    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU 19  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU
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
49static inline QString fullBaseName ( const QFileInfo &fi ) 36static 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
58Om3u::Om3u( const QString &filePath, int mode) 45Om3u::Om3u( const QString &filePath, int mode)
59 : QStringList (){ 46 : QStringList (){
60//qDebug("<<<<<<<new m3u "+filePath); 47//qDebug("<<<<<<<new m3u "+filePath);
61 f.setName(filePath); 48 f.setName(filePath);
62 f.open(mode); 49 f.open(mode);
63} 50}
64 51
65Om3u::~Om3u(){} 52Om3u::~Om3u(){}
66 53
67void Om3u::readM3u() { 54void Om3u::readM3u() {
68// qDebug("<<<<<<reading m3u "+f.name()); 55// qDebug("<<<<<<reading m3u "+f.name());
69 QTextStream t(&f); 56 QTextStream t(&f);
70 t.setEncoding(QTextStream::UnicodeUTF8); 57 t.setEncoding(QTextStream::UnicodeUTF8);
71 QString s; 58 QString s;
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
@@ -1,53 +1,45 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved. 2** Copyright (C) 2000-2002 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of the Qtopia Environment. 4** This file is part of the Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
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
35class PlayListSelectionItem : public QListViewItem { 27class PlayListSelectionItem : public QListViewItem {
36public: 28public:
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
42 ~PlayListSelectionItem() { 34 ~PlayListSelectionItem() {
43 }; 35 };
44 36
45 const DocLnk *file() const { return fl; } 37 const DocLnk *file() const { return fl; }
46 38
47private: 39private:
48 const DocLnk *fl; 40 const DocLnk *fl;
49}; 41};
50 42
51 43
52PlayListSelection::PlayListSelection( QWidget *parent, const char *name ) 44PlayListSelection::PlayListSelection( QWidget *parent, const char *name )
53 : QListView( parent, name ) 45 : QListView( parent, name )
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
@@ -1,78 +1,53 @@
1/********************************************************************** 1/**********************************************************************
2** Copyright (C) 2000 Trolltech AS. All rights reserved. 2** Copyright (C) 2000 Trolltech AS. All rights reserved.
3** 3**
4** This file is part of Qtopia Environment. 4** This file is part of Qtopia Environment.
5** 5**
6** This file may be distributed and/or modified under the terms of the 6** This file may be distributed and/or modified under the terms of the
7** GNU General Public License version 2 as published by the Free Software 7** GNU General Public License version 2 as published by the Free Software
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// 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"
67 42
68#include <unistd.h> 43#include <unistd.h>
69#include <sys/file.h> 44#include <sys/file.h>
70#include <sys/ioctl.h> 45#include <sys/ioctl.h>
71#include <sys/soundcard.h> 46#include <sys/soundcard.h>
72 47
73// for setBacklight() 48// for setBacklight()
74#include <linux/fb.h> 49#include <linux/fb.h>
75#include <sys/types.h> 50#include <sys/types.h>
76#include <sys/stat.h> 51#include <sys/stat.h>
77#include <stdlib.h> 52#include <stdlib.h>
78 53
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
@@ -2,53 +2,49 @@
2 ** Copyright (C) 2000 Trolltech AS. All rights reserved. 2 ** Copyright (C) 2000 Trolltech AS. All rights reserved.
3 ** 3 **
4 ** This file is part of Qtopia Environment. 4 ** This file is part of Qtopia Environment.
5 ** 5 **
6 ** This file may be distributed and/or modified under the terms of the 6 ** This file may be distributed and/or modified under the terms of the
7 ** GNU General Public License version 2 as published by the Free Software 7 ** GNU General Public License version 2 as published by the Free Software
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/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
42extern MediaPlayerState *mediaPlayerState; 38extern MediaPlayerState *mediaPlayerState;
43 39
44 40
45static const int xo = 2; // movable x offset 41static const int xo = 2; // movable x offset
46static const int yo = 0; // movable y offset 42static const int yo = 0; // movable y offset
47 43
48 44
49struct MediaButton { 45struct MediaButton {
50// int xPos, yPos; 46// int xPos, yPos;
51 bool isToggle, isHeld, isDown; 47 bool isToggle, isHeld, isDown;
52// int controlType; 48// int controlType;
53}; 49};
54 50
diff --git a/core/opie-login/loginwindowimpl.cpp b/core/opie-login/loginwindowimpl.cpp
index 330fac5..3037ba3 100644
--- a/core/opie-login/loginwindowimpl.cpp
+++ b/core/opie-login/loginwindowimpl.cpp
@@ -4,60 +4,56 @@
4           .>+-= 4           .>+-=
5 _;:,     .>    :=|. This file is free software; you can 5 _;:,     .>    :=|. This file is free software; you can
6.> <`_,   >  .   <= redistribute it and/or modify it under 6.> <`_,   >  .   <= redistribute it and/or modify it under
7:`=1 )Y*s>-.--   : the terms of the GNU General Public 7:`=1 )Y*s>-.--   : the terms of the GNU General Public
8.="- .-=="i,     .._ License as published by the Free Software 8.="- .-=="i,     .._ License as published by the Free Software
9 - .   .-<_>     .<> Foundation; either version 2 of the License, 9 - .   .-<_>     .<> Foundation; either version 2 of the License,
10     ._= =}       : or (at your option) any later version. 10     ._= =}       : or (at your option) any later version.
11    .%`+i>       _;_. 11    .%`+i>       _;_.
12    .i_,=:_.      -<s. This file is distributed in the hope that 12    .i_,=:_.      -<s. This file is distributed in the hope that
13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY; 13     +  .  -:.       = it will be useful, but WITHOUT ANY WARRANTY;
14    : ..    .:,     . . . without even the implied warranty of 14    : ..    .:,     . . . without even the implied warranty of
15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A 15    =_        +     =;=|` MERCHANTABILITY or FITNESS FOR A
16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General 16  _.=:.       :    :=>`: PARTICULAR PURPOSE. See the GNU General
17..}^=.=       =       ; Public License for more details. 17..}^=.=       =       ; Public License for more details.
18++=   -.     .`     .: 18++=   -.     .`     .:
19 :     =  ...= . :.=- You should have received a copy of the GNU 19 :     =  ...= . :.=- You should have received a copy of the GNU
20 -.   .:....=;==+<; General Public License along with this file; 20 -.   .:....=;==+<; General Public License along with this file;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27#include <qpe/version.h> 27#include <qpe/version.h>
28#include <qapplication.h>
29#include <qpushbutton.h> 28#include <qpushbutton.h>
30#include <qlayout.h> 29#include <qlayout.h>
31#include <qframe.h>
32#include <qlineedit.h> 30#include <qlineedit.h>
33#include <qtimer.h> 31#include <qtimer.h>
34#include <qcombobox.h> 32#include <qcombobox.h>
35#include <qpixmap.h>
36#include <qlabel.h> 33#include <qlabel.h>
37#include <qpopupmenu.h> 34#include <qpopupmenu.h>
38#include <qmessagebox.h> 35#include <qmessagebox.h>
39#include <qimage.h>
40#if QT_VERSION < 300 36#if QT_VERSION < 300
41#include <qgfx_qws.h> 37#include <qgfx_qws.h>
42#endif 38#endif
43#include <qwindowsystem_qws.h> 39#include <qwindowsystem_qws.h>
44 40
45#include <qpe/resource.h> 41#include <qpe/resource.h>
46#include <qpe/qcopenvelope_qws.h> 42#include <qpe/qcopenvelope_qws.h>
47#include <qpe/config.h> 43#include <qpe/config.h>
48 44
49#include <opie/odevice.h> 45#include <opie/odevice.h>
50 46
51#include <stdio.h> 47#include <stdio.h>
52#include <stdlib.h> 48#include <stdlib.h>
53 49
54#include "loginwindowimpl.h" 50#include "loginwindowimpl.h"
55#include "loginapplication.h" 51#include "loginapplication.h"
56#include "inputmethods.h" 52#include "inputmethods.h"
57 53
58using namespace Opie; 54using namespace Opie;
59 55
60 56
61LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose ) 57LoginWindowImpl::LoginWindowImpl ( ) : LoginWindow ( 0, "LOGIN-WINDOW", WStyle_Customize | WStyle_NoBorder | WDestructiveClose )
62{ 58{
63 QPopupMenu *pop = new QPopupMenu ( this ); 59 QPopupMenu *pop = new QPopupMenu ( this );
diff --git a/core/opie-login/main.cpp b/core/opie-login/main.cpp
index 7d2ed63..bf98735 100644
--- a/core/opie-login/main.cpp
+++ b/core/opie-login/main.cpp
@@ -19,63 +19,59 @@
19 :     =  ...= . :.=- You should have received a copy of the GNU 19 :     =  ...= . :.=- You should have received a copy of the GNU
20 -.   .:....=;==+<; General Public License along with this file; 20 -.   .:....=;==+<; General Public License along with this file;
21  -_. . .   )=.  = see the file COPYING. If not, write to the 21  -_. . .   )=.  = see the file COPYING. If not, write to the
22    --        :-=` Free Software Foundation, Inc., 22    --        :-=` Free Software Foundation, Inc.,
23 59 Temple Place - Suite 330, 23 59 Temple Place - Suite 330,
24 Boston, MA 02111-1307, USA. 24 Boston, MA 02111-1307, USA.
25 25
26*/ 26*/
27 27
28#define _GNU_SOURCE 28#define _GNU_SOURCE
29 29
30#include <sys/types.h> 30#include <sys/types.h>
31#include <time.h> 31#include <time.h>
32#include <sys/time.h> 32#include <sys/time.h>
33#include <sys/resource.h> 33#include <sys/resource.h>
34#include <unistd.h> 34#include <unistd.h>
35#include <syslog.h> 35#include <syslog.h>
36#include <sys/wait.h> 36#include <sys/wait.h>
37#include <stdio.h> 37#include <stdio.h>
38#include <stdlib.h> 38#include <stdlib.h>
39#include <signal.h> 39#include <signal.h>
40#include <getopt.h> 40#include <getopt.h>
41#include <string.h> 41#include <string.h>
42 42
43#include <qpe/qpeapplication.h>
44#include <qpe/qcopenvelope_qws.h>
45#include <qpe/qpestyle.h> 43#include <qpe/qpestyle.h>
46#include <qpe/power.h> 44#include <qpe/power.h>
47#include <qpe/config.h> 45#include <qpe/config.h>
48 46
49#include <opie/odevice.h> 47#include <opie/odevice.h>
50 48
51#include <qwindowsystem_qws.h> 49#include <qwindowsystem_qws.h>
52#include <qwsmouse_qws.h>
53#include <qmessagebox.h> 50#include <qmessagebox.h>
54#include <qlabel.h> 51#include <qlabel.h>
55#include <qtimer.h> 52#include <qtimer.h>
56#include <qfile.h> 53#include <qfile.h>
57#include <qtextstream.h>
58 54
59#include "loginapplication.h" 55#include "loginapplication.h"
60#include "loginwindowimpl.h" 56#include "loginwindowimpl.h"
61#include "calibrate.h" 57#include "calibrate.h"
62 58
63using namespace Opie; 59using namespace Opie;
64 60
65int login_main ( int argc, char **argv, pid_t ppid ); 61int login_main ( int argc, char **argv, pid_t ppid );
66void sigterm ( int sig ); 62void sigterm ( int sig );
67void sigint ( int sig ); 63void sigint ( int sig );
68void exit_closelog ( ); 64void exit_closelog ( );
69 65
70static struct option long_options [] = { 66static struct option long_options [] = {
71 { "autologin", 1, 0, 'a' }, 67 { "autologin", 1, 0, 'a' },
72 { 0, 0, 0, 0 } 68 { 0, 0, 0, 0 }
73}; 69};
74 70
75 71
76int main ( int argc, char **argv ) 72int main ( int argc, char **argv )
77{ 73{
78 int userExited = 0; 74 int userExited = 0;
79 pid_t ppid = ::getpid ( ); 75 pid_t ppid = ::getpid ( );
80 76
81 if ( ::geteuid ( ) != 0 ) { 77 if ( ::geteuid ( ) != 0 ) {
diff --git a/core/opie-login/opie-login.pro b/core/opie-login/opie-login.pro
index f9dbe2b..0fdd8e1 100644
--- a/core/opie-login/opie-login.pro
+++ b/core/opie-login/opie-login.pro
@@ -1,26 +1,26 @@
1TEMPLATE = app 1TEMPLATE = app
2CONFIG = qt warn_on debug usepam 2CONFIG = qt warn_on debug
3 3
4HEADERS = loginwindowimpl.h \ 4HEADERS = loginwindowimpl.h \
5 loginapplication.h \ 5 loginapplication.h \
6 ../launcher/inputmethods.h \ 6 ../launcher/inputmethods.h \
7 ../apps/calibrate/calibrate.h 7 ../apps/calibrate/calibrate.h
8 8
9SOURCES = loginwindowimpl.cpp \ 9SOURCES = loginwindowimpl.cpp \
10 loginapplication.cpp \ 10 loginapplication.cpp \
11 ../launcher/inputmethods.cpp \ 11 ../launcher/inputmethods.cpp \
12 ../apps/calibrate/calibrate.cpp \ 12 ../apps/calibrate/calibrate.cpp \
13 main.cpp 13 main.cpp
14 14
15INTERFACES = loginwindow.ui 15INTERFACES = loginwindow.ui
16 16
17INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate 17INCLUDEPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
18DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate 18DEPENDPATH += $(OPIEDIR)/include ../launcher ../apps/calibrate
19 19
20LIBS += -lqpe -lopie 20LIBS += -lqpe -lopie
21 21
22usepam:LIBS += -lpam 22usepam:LIBS += -lpam
23usepam:DEFINES += USEPAM 23usepam:DEFINES += USEPAM
24 24
25DESTDIR = $(OPIEDIR)/bin 25DESTDIR = $(OPIEDIR)/bin
26TARGET = opie-login 26TARGET = opie-login