Mercurial > audlegacy
changeset 319:1e642d74d68c trunk
[svn] Do not abort if libmpc is not found, just disable musepack plugin.
| author | chainsaw |
|---|---|
| date | Sun, 18 Dec 2005 09:06:02 -0800 |
| parents | 43e7cbbf77e1 |
| children | d8889f819081 |
| files | Plugins/Input/aac/src/libmp4.c Plugins/Input/console/Audacious_Driver.cpp configure.ac |
| diffstat | 3 files changed, 8 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/Plugins/Input/aac/src/libmp4.c Sun Dec 18 08:56:26 2005 -0800 +++ b/Plugins/Input/aac/src/libmp4.c Sun Dec 18 09:06:02 2005 -0800 @@ -17,7 +17,6 @@ #include <audacious/plugin.h> #include <libaudacious/util.h> -#include <libaudacious/configfile.h> #include <libaudacious/titlestring.h> #define MP4_DESCRIPTION "MP4 & MPEG2/4-AAC for bmp-0.9.7"
--- a/Plugins/Input/console/Audacious_Driver.cpp Sun Dec 18 08:56:26 2005 -0800 +++ b/Plugins/Input/console/Audacious_Driver.cpp Sun Dec 18 09:06:02 2005 -0800 @@ -13,7 +13,7 @@ #include <glib.h> #include <glib/gi18n.h> #include <gtk/gtk.h> -#include "libaudacious/configfile.h" +#include "libaudacious/configdb.h" #include "libaudacious/util.h" #include "libaudacious/titlestring.h" #include "audacious/input.h" @@ -443,15 +443,15 @@ static void console_init(void) { - ConfigFile *cfg; + ConfigDb *db; - cfg = xmms_cfg_open_default_file(); + db = bmp_cfg_db_open(); - xmms_cfg_read_int(cfg, "console", "loop_length", &audcfg.loop_length); - xmms_cfg_read_boolean(cfg, "console", "resample", &audcfg.resample); - xmms_cfg_read_int(cfg, "console", "resample_rate", &audcfg.resample_rate); + bmp_cfg_db_get_int(db, "console", "loop_length", &audcfg.loop_length); + bmp_cfg_db_get_bool(db, "console", "resample", &audcfg.resample); + bmp_cfg_db_get_int(db, "console", "resample_rate", &audcfg.resample_rate); - xmms_cfg_free(cfg); + bmp_cfg_db_close(db); } extern "C" void console_aboutbox(void)
--- a/configure.ac Sun Dec 18 08:56:26 2005 -0800 +++ b/configure.ac Sun Dec 18 09:06:02 2005 -0800 @@ -465,8 +465,7 @@ if test "$enable_musepack" = "yes"; then AC_CHECK_HEADERS(mpcdec/config_types.h,, - [AC_MSG_ERROR([libmpcdec not installed]) - enable_musepack=no] + enable_musepack=no ) AC_PATH_PROG(TAGLIB_CONFIG, taglib-config, [no], [$PATH:$prefix/bin])