diff --git a/ChangeLog b/ChangeLog index 20aeff5fe..5f7d363c4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,14 @@ +2007-11-12 Tobias Doerffel + + * plugins/ladspa_effect/caps/basics.h: + * plugins/ladspa_effect/caps/interface.cc: + * configure.in: + small fixes for cross-compilation + + * Makefile.am: + * src/core/ladspa_base.cpp: + removed as obsolete + 2007-11-10 Javier Serrano Polo * Makefile.am: diff --git a/Makefile.am b/Makefile.am index e82dc8942..23cba456c 100644 --- a/Makefile.am +++ b/Makefile.am @@ -169,7 +169,6 @@ lmms_SOURCES = \ $(srcdir)/src/core/file_browser.cpp \ $(srcdir)/src/core/import_filter.cpp \ $(srcdir)/src/core/instrument.cpp \ - $(srcdir)/src/core/ladspa_base.cpp \ $(srcdir)/src/core/ladspa_port_dialog.cpp \ $(srcdir)/src/core/ladspa_2_lmms.cpp \ $(srcdir)/src/core/ladspa_manager.cpp \ diff --git a/configure.in b/configure.in index 891d22cb3..c746662c2 100644 --- a/configure.in +++ b/configure.in @@ -263,11 +263,12 @@ fi if test ! -z "$HAVE_LADSPA_H" ; then AC_DEFINE(HAVE_LADSPA_H) fi -if [ "$build_linux" = "true" ] ; then +#if [ "$build_linux" = "true" ] ; then AC_DEFINE(LADSPA_SUPPORT) -fi +#fi #AM_CONDITIONAL(HAVE_LADSPA_H, test ! -z "$HAVE_LADSPA_H") -AM_CONDITIONAL(LADSPA_SUPPORT, test "$build_linux" = "true" ) +#AM_CONDITIONAL(LADSPA_SUPPORT, test "$build_linux" = "true" ) +AM_CONDITIONAL(LADSPA_SUPPORT, test true ) # check for STK @@ -792,7 +793,7 @@ fi -if test "$build_linux" = "true" ; then +#if test "$build_linux" = "true" ; then PLUGINS_TO_BUILD="$PLUGINS_TO_BUILD\n\t\* LADSPA-plugins" if test -z "$HAVE_LADSPA_H" ; then echo " ========================" @@ -808,16 +809,16 @@ if test "$build_linux" = "true" ; then echo " =" with_warnings="true" fi -else - echo " ========================" - echo " === LMMS - WARNING =======================================================" - echo " ========================" - echo " =" - echo " = You're building LMMS for a platform other than Linux which will prevent" - echo " = configure from enabling LADSPA-support." - echo " =" - with_warnings="true" -fi +#else +# echo " ========================" +# echo " === LMMS - WARNING =======================================================" +# echo " ========================" +# echo " =" +# echo " = You're building LMMS for a platform other than Linux which will prevent" +# echo " = configure from enabling LADSPA-support." +# echo " =" +# with_warnings="true" +#fi diff --git a/data/locale/de.qm b/data/locale/de.qm index bad42b187..38ebda7e3 100644 Binary files a/data/locale/de.qm and b/data/locale/de.qm differ diff --git a/plugins/ladspa_effect/caps/basics.h b/plugins/ladspa_effect/caps/basics.h index ab25dee61..2330986e4 100644 --- a/plugins/ladspa_effect/caps/basics.h +++ b/plugins/ladspa_effect/caps/basics.h @@ -84,14 +84,14 @@ #define MIN_GAIN .000001 /* -120 dB */ #define NOISE_FLOOR .00000000000005 /* -266 dB */ -typedef __int8_t int8; -typedef __uint8_t uint8; -typedef __int16_t int16; -typedef __uint16_t uint16; -typedef __int32_t int32; -typedef __uint32_t uint32; -typedef __int64_t int64; -typedef __uint64_t uint64; +typedef int8_t int8; +typedef uint8_t uint8; +typedef int16_t int16; +typedef uint16_t uint16; +typedef int32_t int32; +typedef uint32_t uint32; +typedef int64_t int64; +typedef uint64_t uint64; typedef struct { char * name; @@ -137,7 +137,7 @@ X max (X x, Y y) static inline float frandom() { - return (float) random() / (float) RAND_MAX; + return (float) rand() / (float) RAND_MAX; } #endif /* _BASICS_H_ */ diff --git a/plugins/ladspa_effect/caps/interface.cc b/plugins/ladspa_effect/caps/interface.cc index 32399ee22..53f902949 100644 --- a/plugins/ladspa_effect/caps/interface.cc +++ b/plugins/ladspa_effect/caps/interface.cc @@ -55,7 +55,7 @@ seed() static struct timeval tv; gettimeofday (&tv, 0); - srandom (tv.tv_sec ^ tv.tv_usec); + srand (tv.tv_sec ^ tv.tv_usec); } extern "C" { diff --git a/src/core/ladspa_base.cpp b/src/core/ladspa_base.cpp deleted file mode 100644 index aefc43398..000000000 --- a/src/core/ladspa_base.cpp +++ /dev/null @@ -1,46 +0,0 @@ -/* - * ladspa_base.cpp - LADSPA-base-code - * - * Copyright (c) 2006 Tobias Doerffel - * - * This file is part of Linux MultiMedia Studio - http://lmms.sourceforge.net - * - * This program is free software; you can redistribute it and/or - * 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. - * - * This program is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * General Public License for more details. - * - * You should have received a copy of the GNU General Public - * License along with this program (see COPYING); if not, write to the - * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor, - * Boston, MA 02110-1301 USA. - * - */ - - -#include "plugin.h" - - -extern "C" -{ - -plugin::descriptor ladspa_plugin_descriptor = -{ - STRINGIFY_PLUGIN_NAME( PLUGIN_NAME ), - "LADSPA Base", - "library for all LMMS-plugins dealing with LADSPA-plugins", - "Tobias Doerffel ", - 0x0100, - plugin::Library, - NULL, - NULL -} ; - -} - -