summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJaromil <jaromil@dyne.org>2010-06-14 11:00:15 (GMT)
committer Jaromil <jaromil@dyne.org>2010-06-14 11:00:15 (GMT)
commitdced64c344062734bac8e327c9417e4771d78107 (patch)
tree65d7bd7fa2694b9292013f654e0d2650be6f35a3
parent280ed619f506bce958144bd57fe412d038d97e69 (diff)
removed libmpeg for mp3 decodingHEADmaster
fixed compilation
-rw-r--r--Makefile.am7
-rw-r--r--configure.ac5
-rw-r--r--src/inchannels.cpp8
-rw-r--r--src/obsolete/libmpeg/AUTHORS (renamed from lib/libmpeg/AUTHORS)0
-rw-r--r--src/obsolete/libmpeg/COPYING (renamed from lib/libmpeg/COPYING)0
-rw-r--r--src/obsolete/libmpeg/Makefile.am (renamed from lib/libmpeg/Makefile.am)0
-rw-r--r--src/obsolete/libmpeg/README (renamed from lib/libmpeg/README)0
-rw-r--r--src/obsolete/libmpeg/bitwindow.cc (renamed from lib/libmpeg/bitwindow.cc)0
-rw-r--r--src/obsolete/libmpeg/fileinput.cc (renamed from lib/libmpeg/fileinput.cc)0
-rw-r--r--src/obsolete/libmpeg/fileplayer.cc (renamed from lib/libmpeg/fileplayer.cc)0
-rw-r--r--src/obsolete/libmpeg/filter.cc (renamed from lib/libmpeg/filter.cc)0
-rw-r--r--src/obsolete/libmpeg/filter_2.cc (renamed from lib/libmpeg/filter_2.cc)0
-rw-r--r--src/obsolete/libmpeg/httpinput.cc (renamed from lib/libmpeg/httpinput.cc)0
-rw-r--r--src/obsolete/libmpeg/huffmantable.cc (renamed from lib/libmpeg/huffmantable.cc)0
-rw-r--r--src/obsolete/libmpeg/mpeglayer1.cc (renamed from lib/libmpeg/mpeglayer1.cc)0
-rw-r--r--src/obsolete/libmpeg/mpeglayer2.cc (renamed from lib/libmpeg/mpeglayer2.cc)0
-rw-r--r--src/obsolete/libmpeg/mpeglayer3.cc (renamed from lib/libmpeg/mpeglayer3.cc)0
-rw-r--r--src/obsolete/libmpeg/mpegsound.h (renamed from lib/libmpeg/mpegsound.h)0
-rw-r--r--src/obsolete/libmpeg/mpegsound_locals.h (renamed from lib/libmpeg/mpegsound_locals.h)0
-rw-r--r--src/obsolete/libmpeg/mpegtable.cc (renamed from lib/libmpeg/mpegtable.cc)0
-rw-r--r--src/obsolete/libmpeg/mpegtoraw.cc (renamed from lib/libmpeg/mpegtoraw.cc)0
-rw-r--r--src/obsolete/libmpeg/soundinputstream.cc (renamed from lib/libmpeg/soundinputstream.cc)0
-rw-r--r--src/obsolete/libmpeg/soundplayer.cc (renamed from lib/libmpeg/soundplayer.cc)0
23 files changed, 7 insertions, 13 deletions
diff --git a/Makefile.am b/Makefile.am
index fdfc3c0..859c18c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,7 +2,7 @@ if NCURSES_GUI
LIBCDKDIR = src/ncursesgui/libcdk
endif
-SUBDIRS = lib/libmpeg $(LIBCDKDIR)
+SUBDIRS = $(LIBCDKDIR)
dist_docs_DATA = README COPYING AUTHORS NEWS KNOWN-BUGS ChangeLog TODO USAGE
docsdir = ${prefix}/share/doc/${PACKAGE}
@@ -28,7 +28,6 @@ src_muse_SOURCES = \
src/audioproc.cpp \
src/inchannels.cpp \
src/decoder.cpp \
- src/dec_mp3.cpp \
src/dec_ogg.cpp \
src/dec_snd.cpp \
src/dec_jack.cpp \
@@ -48,7 +47,6 @@ src_muse_SOURCES = \
src_muse_CXXFLAGS = \
-I$(top_srcdir)/src \
- -I$(top_srcdir)/lib/libmpeg \
$(DARWIN_CFLAGS) \
$(GLIB2_CFLAGS) \
$(GUI_CFLAGS) \
@@ -60,7 +58,6 @@ src_muse_CXXFLAGS = \
$(VORBIS_CFLAGS)
src_muse_LDADD = \
- $(top_builddir)/lib/libmpeg/libmpeg.a \
-lpthread \
-ldl \
$(DARWIN_LIBS) \
@@ -77,13 +74,11 @@ src_muse_LDADD = \
$(VORBIS_LIBS)
src_muse_DEPENDENCIES = \
- $(top_builddir)/lib/libmpeg/libmpeg.a \
$(GUI_OBJECTS)
noinst_HEADERS += \
src/audioproc.h \
src/dec_jack.h \
- src/dec_mp3.h \
src/decoder.h \
src/dec_ogg.h \
src/dec_snd.h \
diff --git a/configure.ac b/configure.ac
index 8b9f1f6..12b9e73 100644
--- a/configure.ac
+++ b/configure.ac
@@ -18,7 +18,7 @@ AM_INIT_AUTOMAKE([dist-bzip2 subdir-objects])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
# never run autotools and configure automatically
-AM_MAINTAINER_MODE
+# AM_MAINTAINER_MODE
dnl ==============================================================
dnl Get the operating system and version number...
@@ -402,9 +402,6 @@ LIBS="$LIBS"
AC_CONFIG_FILES([
Makefile
-lib/Makefile
-lib/libmpeg/Makefile
-src/ncursesgui/libcdk/Makefile
doc/muse.doxygen
])
AC_OUTPUT
diff --git a/src/inchannels.cpp b/src/inchannels.cpp
index 1785aca..e7644ff 100644
--- a/src/inchannels.cpp
+++ b/src/inchannels.cpp
@@ -49,7 +49,7 @@
#ifdef HAVE_JACK
#include <dec_jack.h>
#endif
-#include <dec_mp3.h>
+//#include <dec_mp3.h>
#include "httpstream.h"
@@ -285,7 +285,9 @@ int Channel::load(char *file) {
switch(cod) { // various stream types
case HS_MP3:
func("creating Mp3 decoder");
- ndec = new MuseDecMp3();
+ // ndec = new MuseDecMp3();
+ error(_("Can't open Mp3 (support not compiled)"));
+
break;
case HS_OGG:
#ifdef HAVE_VORBIS
@@ -311,7 +313,7 @@ int Channel::load(char *file) {
} else if(strncasecmp(file+strlen(file)-4,".mp3",4)==0) {
func("creating Mp3 decoder");
- ndec = new MuseDecMp3();
+ // ndec = new MuseDecMp3();
} else if(strncasecmp(file+strlen(file)-4,".wav",4)==0
// pallotron: aggiungo lo string compare per i formati sndfile
diff --git a/lib/libmpeg/AUTHORS b/src/obsolete/libmpeg/AUTHORS
index 9150074..9150074 100644
--- a/lib/libmpeg/AUTHORS
+++ b/src/obsolete/libmpeg/AUTHORS
diff --git a/lib/libmpeg/COPYING b/src/obsolete/libmpeg/COPYING
index eb685a5..eb685a5 100644
--- a/lib/libmpeg/COPYING
+++ b/src/obsolete/libmpeg/COPYING
diff --git a/lib/libmpeg/Makefile.am b/src/obsolete/libmpeg/Makefile.am
index 2b61a65..2b61a65 100644
--- a/lib/libmpeg/Makefile.am
+++ b/src/obsolete/libmpeg/Makefile.am
diff --git a/lib/libmpeg/README b/src/obsolete/libmpeg/README
index 96b7aab..96b7aab 100644
--- a/lib/libmpeg/README
+++ b/src/obsolete/libmpeg/README
diff --git a/lib/libmpeg/bitwindow.cc b/src/obsolete/libmpeg/bitwindow.cc
index 3178953..3178953 100644
--- a/lib/libmpeg/bitwindow.cc
+++ b/src/obsolete/libmpeg/bitwindow.cc
diff --git a/lib/libmpeg/fileinput.cc b/src/obsolete/libmpeg/fileinput.cc
index cfbae6c..cfbae6c 100644
--- a/lib/libmpeg/fileinput.cc
+++ b/src/obsolete/libmpeg/fileinput.cc
diff --git a/lib/libmpeg/fileplayer.cc b/src/obsolete/libmpeg/fileplayer.cc
index b878489..b878489 100644
--- a/lib/libmpeg/fileplayer.cc
+++ b/src/obsolete/libmpeg/fileplayer.cc
diff --git a/lib/libmpeg/filter.cc b/src/obsolete/libmpeg/filter.cc
index f34422d..f34422d 100644
--- a/lib/libmpeg/filter.cc
+++ b/src/obsolete/libmpeg/filter.cc
diff --git a/lib/libmpeg/filter_2.cc b/src/obsolete/libmpeg/filter_2.cc
index 05707fe..05707fe 100644
--- a/lib/libmpeg/filter_2.cc
+++ b/src/obsolete/libmpeg/filter_2.cc
diff --git a/lib/libmpeg/httpinput.cc b/src/obsolete/libmpeg/httpinput.cc
index aa692dc..aa692dc 100644
--- a/lib/libmpeg/httpinput.cc
+++ b/src/obsolete/libmpeg/httpinput.cc
diff --git a/lib/libmpeg/huffmantable.cc b/src/obsolete/libmpeg/huffmantable.cc
index e35c38c..e35c38c 100644
--- a/lib/libmpeg/huffmantable.cc
+++ b/src/obsolete/libmpeg/huffmantable.cc
diff --git a/lib/libmpeg/mpeglayer1.cc b/src/obsolete/libmpeg/mpeglayer1.cc
index 0c2e0eb..0c2e0eb 100644
--- a/lib/libmpeg/mpeglayer1.cc
+++ b/src/obsolete/libmpeg/mpeglayer1.cc
diff --git a/lib/libmpeg/mpeglayer2.cc b/src/obsolete/libmpeg/mpeglayer2.cc
index 90cf7b6..90cf7b6 100644
--- a/lib/libmpeg/mpeglayer2.cc
+++ b/src/obsolete/libmpeg/mpeglayer2.cc
diff --git a/lib/libmpeg/mpeglayer3.cc b/src/obsolete/libmpeg/mpeglayer3.cc
index 25d368d..25d368d 100644
--- a/lib/libmpeg/mpeglayer3.cc
+++ b/src/obsolete/libmpeg/mpeglayer3.cc
diff --git a/lib/libmpeg/mpegsound.h b/src/obsolete/libmpeg/mpegsound.h
index bc468d6..bc468d6 100644
--- a/lib/libmpeg/mpegsound.h
+++ b/src/obsolete/libmpeg/mpegsound.h
diff --git a/lib/libmpeg/mpegsound_locals.h b/src/obsolete/libmpeg/mpegsound_locals.h
index 5d091f0..5d091f0 100644
--- a/lib/libmpeg/mpegsound_locals.h
+++ b/src/obsolete/libmpeg/mpegsound_locals.h
diff --git a/lib/libmpeg/mpegtable.cc b/src/obsolete/libmpeg/mpegtable.cc
index 0fa42d2..0fa42d2 100644
--- a/lib/libmpeg/mpegtable.cc
+++ b/src/obsolete/libmpeg/mpegtable.cc
diff --git a/lib/libmpeg/mpegtoraw.cc b/src/obsolete/libmpeg/mpegtoraw.cc
index 88fd919..88fd919 100644
--- a/lib/libmpeg/mpegtoraw.cc
+++ b/src/obsolete/libmpeg/mpegtoraw.cc
diff --git a/lib/libmpeg/soundinputstream.cc b/src/obsolete/libmpeg/soundinputstream.cc
index 6f95230..6f95230 100644
--- a/lib/libmpeg/soundinputstream.cc
+++ b/src/obsolete/libmpeg/soundinputstream.cc
diff --git a/lib/libmpeg/soundplayer.cc b/src/obsolete/libmpeg/soundplayer.cc
index 31ebfe9..31ebfe9 100644
--- a/lib/libmpeg/soundplayer.cc
+++ b/src/obsolete/libmpeg/soundplayer.cc