Merge from BRANCH_1_0

15 files changed, 12 insertions, 18 deletions

diff --git a/core/multimedia/opieplayer/config.in b/core/multimedia/opieplayer/config.in
index dc1b79a..a7ac444 100644
--- a/core/multimedia/opieplayer/config.in
+++ b/core/multimedia/opieplayer/config.in
@@ -1,12 +1,13 @@
   config OPIEPLAYER
-    boolean "opie-mediaplayer (mediaplayer that plays mp3, mpeg, and wav)"
+    boolean "Opieplayer"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE
 
   source core/multimedia/opieplayer/libflash/config.in
   source core/multimedia/opieplayer/libmad/config.in
   source core/multimedia/opieplayer/libmpeg3/config.in
   source core/multimedia/opieplayer/modplug/config.in
   source core/multimedia/opieplayer/wavplugin/config.in
   source core/multimedia/opieplayer/vorbis/tremor/config.in
   source core/multimedia/opieplayer/vorbis/config.in
+  
\ No newline at end of file
diff --git a/core/multimedia/opieplayer/inputDialog.cpp b/core/multimedia/opieplayer/inputDialog.cpp
index 62240b2..38b8f53 100644
--- a/core/multimedia/opieplayer/inputDialog.cpp
+++ b/core/multimedia/opieplayer/inputDialog.cpp
@@ -1,35 +1,32 @@
 #include "inputDialog.h"
 
 #include <qpe/resource.h>
 
 #include <opie/ofiledialog.h>
 
 #include <qlineedit.h>
-#include <qlayout.h>
-#include <qvariant.h>
 #include <qpushbutton.h>
-#include <qwhatsthis.h>
 
 InputDialog::InputDialog( QWidget* parent,  const char* name, bool modal, WFlags fl )
     : QDialog( parent, name, modal, fl ) {
     if ( !name ) {
         setName( "InputDialog" );
     }
     resize( 234, 115);
     setMaximumSize( QSize( 240, 40));
     setCaption( tr( name ) );
 
     QPushButton *browserButton;
     browserButton = new QPushButton( Resource::loadIconSet("fileopen"),"",this,"BrowseButton");
     browserButton->setGeometry( QRect( 205, 10, 22, 22));
     connect( browserButton, SIGNAL(released()),this,SLOT(browse()));
     LineEdit1 = new QLineEdit( this, "LineEdit1" );
     LineEdit1->setGeometry( QRect( 4, 10, 190, 22 ) );
     LineEdit1->setFocus();
 }
 /*
  * return the current text(input)
  */
 QString InputDialog::text() const {
    return LineEdit1->text(); 
 }
diff --git a/core/multimedia/opieplayer/libmad/config.in b/core/multimedia/opieplayer/libmad/config.in
index 72249dc..1239166 100644
--- a/core/multimedia/opieplayer/libmad/config.in
+++ b/core/multimedia/opieplayer/libmad/config.in
@@ -1,4 +1,4 @@
   config LIBMAD
-    boolean "opieplayer1-libmadplugin (plugin with shoutcast/icecast support to play MP3 files)"
+    boolean "libmadplugin"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h
index 6747712..b05ba15 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.h
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.h
@@ -11,49 +11,48 @@
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
 #ifndef LIBMAD_PLUGIN_H
 #define LIBMAD_PLUGIN_H
 
 #include <qstring.h>
 #include <qpe/mediaplayerplugininterface.h>
 /* #include "../mediaplayerplugininterface.h" */
 
 
 // #define OLD_MEDIAPLAYER_API
 
 
 class LibMadPluginData;
 
 
 class LibMadPlugin : public MediaPlayerDecoder {
-
 public:
     LibMadPlugin();
     ~LibMadPlugin();
 
     const char *pluginName() { return "LibMadPlugin"; }
     const char *pluginComment() { return "This is the libmad library that has been wrapped as a plugin"; }
     double pluginVersion() { return 1.0; }
 
     bool isFileSupported( const QString& );
     bool open( const QString& );
 
     bool close();
     bool isOpen();
     const QString &fileInfo() { return info; }
 
     // If decoder doesn't support audio then return 0 here
     int audioStreams();
     int audioChannels( int stream );
     int audioFrequency( int stream );
     int audioSamples( int stream );
     bool audioSetSample( long sample, int stream );
 /*     int audioBitsPerSample(int) {return 0;} */
     long audioGetSample( int stream );
 #ifdef OLD_MEDIAPLAYER_API
diff --git a/core/multimedia/opieplayer/libmpeg3/config.in b/core/multimedia/opieplayer/libmpeg3/config.in
index b965a40..b634594 100644
--- a/core/multimedia/opieplayer/libmpeg3/config.in
+++ b/core/multimedia/opieplayer/libmpeg3/config.in
@@ -1,4 +1,4 @@
   config LIBMPEG3
-    boolean "opieplayer1-libmpeg3plugin (play MPEG3 video files)"
+    boolean "libmpeg3plugin"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/main.cpp b/core/multimedia/opieplayer/main.cpp
index 18cd7a6..32dc1d5 100644
--- a/core/multimedia/opieplayer/main.cpp
+++ b/core/multimedia/opieplayer/main.cpp
@@ -1,44 +1,43 @@
 /**********************************************************************
 ** Copyright (C) 2000-2002 Trolltech AS.  All rights reserved.
 **
 ** This file is part of the Qtopia Environment.
 **
 ** This file may be distributed and/or modified under the terms of the
 ** GNU General Public License version 2 as published by the Free Software
 ** Foundation and appearing in the file LICENSE.GPL included in the
 ** packaging of this file.
 **
 ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
 ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
 **
 ** See http://www.trolltech.com/gpl/ for GPL licensing information.
 **
 ** Contact info@trolltech.com if any conditions of this licensing are
 ** not clear to you.
 **
 **********************************************************************/
-#include <qpe/qpeapplication.h>
 #include "mediaplayerstate.h"
 #include "playlistwidget.h"
 #include "audiowidget.h"
 #include "videowidget.h"
 #include "loopcontrol.h"
 #include "mediaplayer.h"
 
 MediaPlayerState *mediaPlayerState;
 PlayListWidget *playList;
 AudioWidget *audioUI;
 VideoWidget *videoUI;
 LoopControl *loopControl;
 
 
 int main(int argc, char **argv) {
     QPEApplication a(argc,argv);
 
     MediaPlayerState st( 0, "mediaPlayerState" );
     mediaPlayerState = &st;
     PlayListWidget pl( 0, "playList" );
     playList = &pl;
     AudioWidget aw( 0, "audioUI" );
     audioUI = &aw;
     VideoWidget vw( 0, "videoUI" );
diff --git a/core/multimedia/opieplayer/modplug/config.in b/core/multimedia/opieplayer/modplug/config.in
index 86e4725..769db1b 100644
--- a/core/multimedia/opieplayer/modplug/config.in
+++ b/core/multimedia/opieplayer/modplug/config.in
@@ -1,4 +1,4 @@
   config MODPLUG
-    boolean "opieplayer1-modplugin (play MOD/XM/S3M/IT amiga tracker modules)"
+    boolean "modplugin"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/modplug/load_j2b.cpp b/core/multimedia/opieplayer/modplug/load_j2b.cpp
index 5f60bbb..4f0b85c 100644
--- a/core/multimedia/opieplayer/modplug/load_j2b.cpp
+++ b/core/multimedia/opieplayer/modplug/load_j2b.cpp
@@ -1,18 +1,17 @@
 /*
  * This program is  free software; you can redistribute it  and modify it
  * under the terms of the GNU  General Public License as published by the
  * Free Software Foundation; either version 2  of the license or (at your
  * option) any later version.
  *
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
 
 ///////////////////////////////////////////////////
 //
 // J2B module loader
 //
 ///////////////////////////////////////////////////
 #include "stdafx.h"
-#include "sndfile.h"
 
diff --git a/core/multimedia/opieplayer/modplug/tables.cpp b/core/multimedia/opieplayer/modplug/tables.cpp
index e7198b2..baf4517 100644
--- a/core/multimedia/opieplayer/modplug/tables.cpp
+++ b/core/multimedia/opieplayer/modplug/tables.cpp
@@ -1,35 +1,34 @@
 /*
  * This program is  free software; you can redistribute it  and modify it
  * under the terms of the GNU  General Public License as published by the
  * Free Software Foundation; either version 2  of the license or (at your
  * option) any later version.
  *
  * Authors: Olivier Lapicque <olivierl@jps.net>
 */
 
 #include "stdafx.h"
-#include "sndfile.h"
 
 #ifndef FASTSOUNDLIB
 //#pragma data_seg(".tables")
 #endif
 
 extern const BYTE ImpulseTrackerPortaVolCmd[16];
 const BYTE ImpulseTrackerPortaVolCmd[16] =
 {
 	0x00, 0x01, 0x04, 0x08, 0x10, 0x20, 0x40, 0x60,
 	0x80, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF
 };
 
 // Period table for Protracker octaves 0-5:
 extern const WORD ProTrackerPeriodTable[6*12];
 const WORD ProTrackerPeriodTable[6*12] =
 {
 	1712,1616,1524,1440,1356,1280,1208,1140,1076,1016,960,907,
 	856,808,762,720,678,640,604,570,538,508,480,453,
 	428,404,381,360,339,320,302,285,269,254,240,226,
 	214,202,190,180,170,160,151,143,135,127,120,113,
 	107,101,95,90,85,80,75,71,67,63,60,56,
 	53,50,47,45,42,40,37,35,33,31,30,28
 };
 
diff --git a/core/multimedia/opieplayer/playlistwidget.cpp b/core/multimedia/opieplayer/playlistwidget.cpp
index b393230..8016d8e 100644
--- a/core/multimedia/opieplayer/playlistwidget.cpp
+++ b/core/multimedia/opieplayer/playlistwidget.cpp
@@ -69,49 +69,49 @@
 #include <sys/ioctl.h>
 #include <sys/soundcard.h>
 
 // for setBacklight()
 #include <linux/fb.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <stdlib.h>
 
 #define BUTTONS_ON_TOOLBAR
 #define SIDE_BUTTONS
 #define CAN_SAVE_LOAD_PLAYLISTS
 
 extern AudioWidget *audioUI;
 extern VideoWidget *videoUI;
 extern MediaPlayerState *mediaPlayerState;
 
 static inline QString fullBaseName ( const QFileInfo &fi )
 {
   QString str = fi. fileName ( );
   return str. left ( str. findRev ( '.' ));
 }
 
 
-QString audioMimes ="audio/mpeg;audio/x-wav;audio/x-ogg;audio/x-mod;audio/x-ogg";
+QString audioMimes ="audio/mpeg;audio/x-wav;application/ogg;audio/x-mod";
 // class myFileSelector {
 
 // };
 class PlayListWidgetPrivate {
 public:
     QToolButton *tbPlay, *tbFull, *tbLoop, *tbScale, *tbShuffle, *tbAddToList,  *tbRemoveFromList, *tbMoveUp, *tbMoveDown, *tbRemove;
     QFrame *playListFrame;
     FileSelector *files;
     PlayListSelection *selectedFiles;
     bool setDocumentUsed;
     DocLnk *current;
 };
 
 
 class ToolButton : public QToolButton {
 public:
     ToolButton( QWidget *parent, const char *name, const QString& icon, QObject *handler, const QString& slot, bool t = FALSE )
             : QToolButton( parent, name ) {
         setTextLabel( name );
         setPixmap( Resource::loadPixmap( icon ) );
         setAutoRaise( TRUE );
         setFocusPolicy( QWidget::NoFocus );
         setToggleButton( t );
         connect( this, t ? SIGNAL( toggled(bool) ) : SIGNAL( clicked() ), handler, slot );
@@ -1351,49 +1351,49 @@ void PlayListWidget::keyReleaseEvent( QKeyEvent *e)
 void PlayListWidget::keyPressEvent( QKeyEvent *)
 {
 //    qDebug("Key press");
 //     switch ( e->key() ) {
 // ////////////////////////////// Zaurus keys
 //       case Key_A: //add to playlist
 //           qDebug("Add");
 //           addSelected();
 //           break;
 //       case Key_R: //remove from playlist
 //           removeSelected();
 //           break;
 //       case Key_P: //play
 //           qDebug("Play");
 //           playSelected();
 //           break;
 //       case Key_Space:
 //           qDebug("Play");
 //           playSelected();
 //           break;
 //     }
 }
 
 void PlayListWidget::doBlank() {
-	// TODO: why do we blank this way, why don't we use ODevice or ScreenSaver?
+   //    qDebug("do blanking");
 #ifdef QT_QWS_DEVFS
    fd=open("/dev/fb/0",O_RDWR);
 #else
    fd=open("/dev/fb0",O_RDWR);
 #endif
    if (fd != -1) {
       ioctl(fd,FBIOBLANK,1);
       //            close(fd);
    }
 }
 
 void PlayListWidget::doUnblank() {
    // this crashes opieplayer with a segfault
    //      int fd;
    //       fd=open("/dev/fb0",O_RDWR);
    //    qDebug("do unblanking");
    if (fd != -1) {
       ioctl(fd,FBIOBLANK,0);
       close(fd);
    }
    QCopEnvelope h("QPE/System", "setBacklight(int)");
    h <<-3;// v[1]; // -3 Force on
 }
 
diff --git a/core/multimedia/opieplayer/vorbis/config.in b/core/multimedia/opieplayer/vorbis/config.in
index bad9922..d66ec88 100644
--- a/core/multimedia/opieplayer/vorbis/config.in
+++ b/core/multimedia/opieplayer/vorbis/config.in
@@ -1,5 +1,6 @@
   config LIBTREMORPLUGIN
-    boolean "opieplayer1-libtremorplugin (play OGG vorbis files)"
+    boolean "libtremorplugin"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER
+    comment "tremor is ogg vorbis!!"
     
\ No newline at end of file
diff --git a/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp b/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp
index c1e1a23..53c4b2b 100644
--- a/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp
+++ b/core/multimedia/opieplayer/vorbis/libtremorplugin.cpp
@@ -18,49 +18,48 @@
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 ****************************************************************************/
 // fixed and adapted for opieplayer 2003 ljp <llornkcor@handhelds.org>
 
 #include <stdio.h>
 #include <stdarg.h>
 #include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
 #include <time.h>
 #include <locale.h>
 #include <math.h>
 #include <assert.h>
 
 #include <qmap.h>
 
 #include "libtremorplugin.h"
 
 
 extern "C" {
-#include "tremor/ivorbiscodec.h"
 #include "tremor/ivorbisfile.h"
 }
 
 
 #define MPEG_BUFFER_SIZE    65536
 //#define debugMsg(a) qDebug(a)
 #define debugMsg(a)
 
 
 class LibTremorPluginData {
 public:
   char* filename;
   FILE* f;
   OggVorbis_File vf;
   vorbis_info* vi;
   vorbis_comment* vc;
   bool bos;
   int csection;
   QString finfo;
 };
 
 
 LibTremorPlugin::LibTremorPlugin() {
 qDebug("<<<<<<<<<<<<<TREMOR!!!!!>>>>>>>>>>>>>>>>>>");
diff --git a/core/multimedia/opieplayer/vorbis/tremor/config.in b/core/multimedia/opieplayer/vorbis/tremor/config.in
index 8ee753c..f803d16 100644
--- a/core/multimedia/opieplayer/vorbis/tremor/config.in
+++ b/core/multimedia/opieplayer/vorbis/tremor/config.in
@@ -1,4 +1,4 @@
   config LIBTREMOR
-    boolean "libtremor (library needed to play OGG files)"
+    boolean "libtremor"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && OPIEPLAYER
diff --git a/core/multimedia/opieplayer/vorbis/vorbis.pro b/core/multimedia/opieplayer/vorbis/vorbis.pro
index a15cf9c..d566003 100644
--- a/core/multimedia/opieplayer/vorbis/vorbis.pro
+++ b/core/multimedia/opieplayer/vorbis/vorbis.pro
@@ -1,11 +1,11 @@
 TEMPLATE  =   lib
 CONFIG    +=  qt warn_on release
-HEADERS   =   libtremorplugin.h libtremorinimpl.h
+HEADERS   =   libtremorplugin.h libtremorpluginimpl.h
 SOURCES         =   libtremorplugin.cpp libtremorpluginimpl.cpp
 TARGET    =   tremorplugin
 DESTDIR   =   $(OPIEDIR)/plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include .. tremor
 DEPENDPATH      +=  $(OPIEDIR)/include .. tremor 
 LIBS            +=  -lqpe -lm -ltremor
 VERSION   =   1.0.0
 include ( $(OPIEDIR)/include.pro )
diff --git a/core/multimedia/opieplayer/wavplugin/config.in b/core/multimedia/opieplayer/wavplugin/config.in
index 56bdfab..6e4c4b3 100644
--- a/core/multimedia/opieplayer/wavplugin/config.in
+++ b/core/multimedia/opieplayer/wavplugin/config.in
@@ -1,4 +1,4 @@
   config WAVPLUGIN
-    boolean "opieplayer1-wavplugin (play WAV files)"
+    boolean "wavplugin"
     default "y"
     depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE && OPIEPLAYER