summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLuca Bigliardi <shammash@artha.org>2009-10-04 17:54:58 (GMT)
committer Luca Bigliardi <shammash@artha.org>2009-10-14 12:36:58 (GMT)
commit4bea5c8813a45b0c94f8cf02f20e99645ea966f5 (patch)
treed6912d822822f330003b801662edbdfdd7349c0f
parente537fdb230cad7e271d58edd55d67c2825fbc2be (diff)
Stop checking for lame at compile time
Remove configure check and HAVE_LAME. Signed-off-by: Luca Bigliardi <shammash@artha.org>
-rw-r--r--configure.ac15
-rw-r--r--src/gtkgui2/ice.cpp6
-rw-r--r--src/jmixer.cpp4
-rw-r--r--src/muse.cpp4
-rw-r--r--src/out_lame.cpp2
-rw-r--r--src/out_lame.h2
-rw-r--r--src/outchannels.cpp2
-rw-r--r--src/radiosched.cpp2
8 files changed, 0 insertions, 37 deletions
diff --git a/configure.ac b/configure.ac
index 076b1b7..09814b7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -248,21 +248,6 @@ PKG_CHECK_MODULES(VORBIS, vorbis vorbisenc vorbisfile,
[have_vorbis=no])
-dnl ==============
-dnl CHECK LAME LIB
-dnl ==============
-AC_CHECK_HEADER(lame/lame.h, [
- have_lame=yes;
- AC_MSG_NOTICE([MP3 encoder found and successfully linked])
- AC_DEFINE(HAVE_LAME, 1, [Building with LAME support])
- LAME_LIBS="-lmp3lame"
- AC_SUBST(LAME_LIBS)
- ], [
- have_lame=no;
- AC_MSG_WARN([LAME libraries not found, no MP3 support])
- ])
-
-
dnl Check for socklen_t
AC_MSG_CHECKING([for unix98 socklen_t])
AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include <sys/types.h>
diff --git a/src/gtkgui2/ice.cpp b/src/gtkgui2/ice.cpp
index bf99728..f797dde 100644
--- a/src/gtkgui2/ice.cpp
+++ b/src/gtkgui2/ice.cpp
@@ -62,12 +62,10 @@ void ice_window(GtkWidget *w)
gtk_box_pack_start(GTK_BOX(tmpbox), menubar, FALSE, FALSE, 0);
menuroot = gtk_menu_new();
-#ifdef HAVE_LAME
menuitem = gtk_menu_item_new_with_label(_("Lame"));
g_signal_connect(G_OBJECT(menuitem), "activate",
G_CALLBACK(ice_new_from_menu), NULL);
gtk_menu_append(GTK_MENU(menuroot), menuitem);
-#endif
#ifdef HAVE_VORBIS
menuitem = gtk_menu_item_new_with_label(_("Ogg/Vorbis"));
@@ -83,7 +81,6 @@ void ice_window(GtkWidget *w)
nbook = gtk_notebook_new();
gtk_box_pack_start(GTK_BOX(tmpbox), nbook, FALSE, FALSE, 0);
-#ifdef HAVE_LAME
/* Create Lame Streaming tab */
tmpbox = gtk_vbox_new(FALSE, 5);
tmplabel = gtk_label_new(_("Lame Streaming (MP3)"));
@@ -109,7 +106,6 @@ void ice_window(GtkWidget *w)
ice_new(MP3);
-#endif
#ifdef HAVE_VORBIS
/* Create Ogg/Vorbis Streaming tab */
@@ -138,9 +134,7 @@ void ice_window(GtkWidget *w)
#endif
gtk_widget_show_all(winil);
-#ifdef HAVE_LAME
gtk_widget_hide_all(tmpmp3->tabbola);
-#endif
#ifdef HAVE_VORBIS
gtk_widget_hide_all(tmpogg->tabbola);
diff --git a/src/jmixer.cpp b/src/jmixer.cpp
index d97ba8f..852eed9 100644
--- a/src/jmixer.cpp
+++ b/src/jmixer.cpp
@@ -50,9 +50,7 @@
#include <out_vorbis.h>
#endif
-#ifdef HAVE_LAME
#include <out_lame.h>
-#endif
#ifndef CODENAME
#define CODENAME "STREAMTIME"
@@ -857,7 +855,6 @@ int Stream_mixer::create_enc(enum codec enc) {
break;
#endif
-#ifdef HAVE_LAME
case MP3:
outch= new OutLame;
if( ! ((OutLame*)outch)->init() ) {
@@ -867,7 +864,6 @@ int Stream_mixer::create_enc(enum codec enc) {
}
break;
-#endif
default: break; /* placeholder */
diff --git a/src/muse.cpp b/src/muse.cpp
index af6cb8c..d7efbe0 100644
--- a/src/muse.cpp
+++ b/src/muse.cpp
@@ -316,12 +316,10 @@ bool take_args(int argc, char **argv) {
}
#endif
-#ifdef HAVE_LAME
if (strncasecmp("mp3",optarg,3) == 0) {
encid = mix->create_enc(MP3);
notice("CLI: created Mp3 encoder");
}
-#endif
if(encid>0) outch = mix->get_enc(encid);
if(outch) break;
@@ -331,9 +329,7 @@ bool take_args(int argc, char **argv) {
#ifdef HAVE_VORBIS
act(" OGG - Ogg/Vorbis codec");
#endif
-#ifdef HAVE_LAME
act(" MP3 - Lame MP3 codec");
-#endif
exit(0);
case 'b':
diff --git a/src/out_lame.cpp b/src/out_lame.cpp
index a7233e6..f526b5f 100644
--- a/src/out_lame.cpp
+++ b/src/out_lame.cpp
@@ -21,7 +21,6 @@
#include <math.h>
#include <out_lame.h>
-#ifdef HAVE_LAME
#include <lame_wrap.h>
#include <jutils.h>
@@ -195,4 +194,3 @@ OutLame::~OutLame() {
if(enc_flags) LameWrap::close(enc_flags);
}
-#endif
diff --git a/src/out_lame.h b/src/out_lame.h
index 15ada5b..7480212 100644
--- a/src/out_lame.h
+++ b/src/out_lame.h
@@ -25,7 +25,6 @@
#include <outchannels.h>
#include <lame_wrap.h>
#include <config.h>
-#ifdef HAVE_LAME
class OutLame : public OutChannel {
@@ -46,4 +45,3 @@ class OutLame : public OutChannel {
#endif
-#endif
diff --git a/src/outchannels.cpp b/src/outchannels.cpp
index 67adc4e..23dcd8e 100644
--- a/src/outchannels.cpp
+++ b/src/outchannels.cpp
@@ -39,9 +39,7 @@
#include <jutils.h>
#include <config.h>
-#ifdef HAVE_LAME
#include <out_lame.h>
-#endif
#ifdef HAVE_VORBIS
#include <out_vorbis.h>
diff --git a/src/radiosched.cpp b/src/radiosched.cpp
index 4f569d8..5c43482 100644
--- a/src/radiosched.cpp
+++ b/src/radiosched.cpp
@@ -52,9 +52,7 @@
#include <out_vorbis.h>
#endif
-#ifdef HAVE_LAME
#include <out_lame.h>
-#endif
#include <glib.h>