diff options
| -rw-r--r-- | junklib.c | 2 | ||||
| -rw-r--r-- | plugins.c | 10 | ||||
| -rw-r--r-- | plugins/sid/csid.cpp | 2 | ||||
| -rw-r--r-- | plugins/tta/filter.h | 4 |
4 files changed, 12 insertions, 6 deletions
@@ -214,7 +214,7 @@ junk_iconv (const char *in, int inlen, char *out, int outlen, const char *cs_in, } //trace ("iconv out: %s (len=%d)\n", out, pout - out); return pout - out; -#elif TARGET_ANDROID +#elif defined(ANDROID) // TODO: android charset conversion return 0; #endif @@ -594,7 +594,7 @@ plug_load_all (void) { trace ("\033[0;31mDISABLE_VERSIONCHECK=1! do not distribute!\033[0;m\n"); #endif -#if !TARGET_ANDROID +#ifndef ANDROID const char *conf_blacklist_plugins = conf_get_str ("blacklist_plugins", ""); trace ("plug: mutex_create\n"); mutex = mutex_create (); @@ -726,7 +726,7 @@ plug_load_all (void) { #define PLUG(n) plug_init_plugin (n##_load, NULL); #include "moduleconf.h" #undef PLUG -#if TARGET_ANDROID +#ifdef ANDROID #define PLUG(n) extern DB_plugin_t * n##_load (DB_functions_t *api); #include "moduleconf-android.h" #undef PLUG @@ -873,7 +873,7 @@ plug_unload_all (void) { trace ("stopped all plugins\n"); while (plugins) { plugin_t *next = plugins->next; -#if !TARGET_ANDROID +#ifndef ANDROID if (plugins->handle) { dlclose (plugins->handle); } @@ -931,6 +931,9 @@ plug_get_output (void) { int plug_select_output (void) { +#ifdef ANDROID + return 0; +#else const char *outplugname = conf_get_str ("output_plugin", _("ALSA output plugin")); for (int i = 0; g_output_plugins[i]; i++) { DB_output_t *p = g_output_plugins[i]; @@ -952,6 +955,7 @@ plug_select_output (void) { } plug_trigger_event (DB_EV_OUTPUTCHANGED, 0); return 0; +#endif } void diff --git a/plugins/sid/csid.cpp b/plugins/sid/csid.cpp index 6ef5e62f..80236854 100644 --- a/plugins/sid/csid.cpp +++ b/plugins/sid/csid.cpp @@ -34,6 +34,7 @@ #include "../../deadbeef.h" #include "csid.h" +#ifndef ANDROID int _Unwind_Resume_or_Rethrow; int _Unwind_RaiseException; int _Unwind_GetLanguageSpecificData; @@ -45,6 +46,7 @@ int _Unwind_GetDataRelBase; int _Unwind_GetRegionStart; int _Unwind_SetGR; int _Unwind_GetIPInfo; +#endif extern DB_decoder_t sid_plugin; diff --git a/plugins/tta/filter.h b/plugins/tta/filter.h index 6e8b13da..1f86cbb1 100644 --- a/plugins/tta/filter.h +++ b/plugins/tta/filter.h @@ -42,7 +42,7 @@ ///////// Filter Settings ////////// static int flt_set[3] = {10, 9, 10}; -__inline void +static __inline void memshl (register int *pA, register int *pB) { *pA++ = *pB++; *pA++ = *pB++; @@ -54,7 +54,7 @@ memshl (register int *pA, register int *pB) { *pA = *pB; } -__inline void +static __inline void hybrid_filter (fltst *fs, int *in) { register int *pA = fs->dl; register int *pB = fs->qm; |