From f180c1a5e8fc889ff1fb390d5cc94cdbc5085046 Mon Sep 17 00:00:00 2001
From: llornkcor <llornkcor>
Date: Mon, 25 Feb 2002 01:35:47 +0000
Subject: fucked up- no workie.. back out

---
(limited to 'core/multimedia/opieplayer/libmad')

diff --git a/core/multimedia/opieplayer/libmad/Makefile.in b/core/multimedia/opieplayer/libmad/Makefile.in
index 552043c..e9f74e7 100644
--- a/core/multimedia/opieplayer/libmad/Makefile.in
+++ b/core/multimedia/opieplayer/libmad/Makefile.in
@@ -214,12 +214,10 @@ huffman.o: huffman.c \
 
 libmadplugin.o: libmadplugin.cpp \
 		libmadplugin.h \
-		../mediaplayerplugininterface.h \
 		mad.h
 
 libmadpluginimpl.o: libmadpluginimpl.cpp \
 		libmadplugin.h \
-		../mediaplayerplugininterface.h \
 		libmadpluginimpl.h
 
 
diff --git a/core/multimedia/opieplayer/libmad/libmad.pro b/core/multimedia/opieplayer/libmad/libmad.pro
index b54ca6b..6c40a15 100644
--- a/core/multimedia/opieplayer/libmad/libmad.pro
+++ b/core/multimedia/opieplayer/libmad/libmad.pro
@@ -1,14 +1,12 @@
-TEMPLATE  =   lib
-CONFIG    +=  qt warn_on release
-HEADERS   =   libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
-        layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
-SOURCES         =   version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
-        layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
-TARGET    =   madplugin
-DESTDIR   =   ../../plugins/codecs
+TEMPLATE	=   lib
+CONFIG		+=  qt warn_on release
+HEADERS		=   libmad_version.h fixed.h bit.h timer.h stream.h frame.h synth.h decoder.h \
+		    layer12.h layer3.h huffman.h libmad_global.h mad.h libmadplugin.h libmadpluginimpl.h
+SOURCES	        =   version.c fixed.c bit.c timer.c stream.c frame.c synth.c decoder.c \
+		    layer12.c layer3.c huffman.c libmadplugin.cpp libmadpluginimpl.cpp
+TARGET		=   madplugin
+DESTDIR		=   ../../plugins/codecs
 INCLUDEPATH += $(OPIEDIR)/include ..
 DEPENDPATH      +=  ../$(OPIEDIR)/include ..
-TMAKE_CFLAGS += -DFPM_64BIT
-TMAKE_CXXFLAGS += -DFPM_64BIT
 LIBS            +=  -lqpe -lm
-VERSION   =   1.0.0
+VERSION		=   1.0.0
diff --git a/core/multimedia/opieplayer/libmad/libmadplugin.h b/core/multimedia/opieplayer/libmad/libmadplugin.h
index ff84c27..d85e0d4 100644
--- a/core/multimedia/opieplayer/libmad/libmadplugin.h
+++ b/core/multimedia/opieplayer/libmad/libmadplugin.h
@@ -20,10 +20,8 @@
 #ifndef LIBMAD_PLUGIN_H 
 #define LIBMAD_PLUGIN_H
 
-
 #include <qstring.h>
-//#include <qpe/mediaplayerplugininterface.h>
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>
 
 
 // #define OLD_MEDIAPLAYER_API
@@ -54,7 +52,6 @@ public:
     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
     bool audioReadMonoSamples( short *output, long samples, long& samplesRead, int stream );
diff --git a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
index 8ad4956..2c5ed3b 100644
--- a/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
+++ b/core/multimedia/opieplayer/libmad/libmadpluginimpl.h
@@ -20,9 +20,7 @@
 #ifndef LIBMAD_PLUGIN_IMPL_H 
 #define LIBMAD_PLUGIN_IMPL_H
 
-
-//#include <qpe/mediaplayerplugininterface.h>
-#include "../mediaplayerplugininterface.h"
+#include <qpe/mediaplayerplugininterface.h>
 
 
 class LibMadPlugin;
@@ -43,6 +41,7 @@ public:
 
     virtual MediaPlayerDecoder *decoder();
     virtual MediaPlayerEncoder *encoder();
+
 private:
     LibMadPlugin *libmadplugin;
     ulong ref;
diff --git a/core/multimedia/opieplayer/libmad/version.c b/core/multimedia/opieplayer/libmad/version.c
index 1baba26..413d54b 100644
--- a/core/multimedia/opieplayer/libmad/version.c
+++ b/core/multimedia/opieplayer/libmad/version.c
@@ -88,4 +88,4 @@ char const mad_build[] =
 # elif defined(NDEBUG)
   "NDEBUG "
 # endif
-;
\ No newline at end of file
+;
--
cgit v0.9.0.2