diff options
author | 2012-03-20 20:52:29 +0100 | |
---|---|---|
committer | 2012-03-20 20:52:29 +0100 | |
commit | 6d8f99ce8f827e95c09bfb33251fe210ce0c2c39 (patch) | |
tree | 4c320a0161509d12289d3eb1ad99ae572fff5ce9 /plugins | |
parent | 010c5663fca158493ce9174407002d2fe665e2f5 (diff) |
0.5.2-rc2 fixes
Diffstat (limited to 'plugins')
-rw-r--r-- | plugins/adplug/Makefile.am | 4 | ||||
-rw-r--r-- | plugins/adplug/adplug-db.cpp | 6 | ||||
-rw-r--r-- | plugins/ao/Makefile.am | 8 | ||||
-rw-r--r-- | plugins/ao/plugin.c | 2 | ||||
-rw-r--r-- | plugins/converter/support.c | 25 |
5 files changed, 38 insertions, 7 deletions
diff --git a/plugins/adplug/Makefile.am b/plugins/adplug/Makefile.am index 3bd6fd85..6a56e1b8 100644 --- a/plugins/adplug/Makefile.am +++ b/plugins/adplug/Makefile.am @@ -5,9 +5,9 @@ adlibdir = $(libdir)/$(PACKAGE) pkglib_LTLIBRARIES = adplug.la AM_CFLAGS = $(CFLAGS) -std=c99 -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fPIC -adplug_la_LDFLAGS = -module -nostdlib +adplug_la_LDFLAGS = -module -nostdlib -lm -lsupc++ -AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fno-exceptions -fno-rtti -nostdlib -fno-unwind-tables -fPIC +AM_CPPFLAGS = $(CXXFLAGS) -Dstricmp=strcasecmp -DVERSION=\"2.1\" -I$(adplugpath)/adplug -I$(adplugpath)/libbinio -fno-exceptions -fno-rtti -fno-unwind-tables adplug_la_SOURCES = plugin.c\ adplug-db.cpp\ diff --git a/plugins/adplug/adplug-db.cpp b/plugins/adplug/adplug-db.cpp index 98005298..f6936ff6 100644 --- a/plugins/adplug/adplug-db.cpp +++ b/plugins/adplug/adplug-db.cpp @@ -42,6 +42,12 @@ int _Unwind_GetDataRelBase; int _Unwind_GetRegionStart; int _Unwind_SetGR; int _Unwind_GetIPInfo; +//int __cxa_pure_virtual; +////int _Znaj; +////int _ZdaPv; +//int __cxa_guard_release; +////int _ZdlPv; +//int __cxa_guard_acquire; extern "C" { diff --git a/plugins/ao/Makefile.am b/plugins/ao/Makefile.am index 62df2b2c..5a7750e5 100644 --- a/plugins/ao/Makefile.am +++ b/plugins/ao/Makefile.am @@ -1,7 +1,7 @@ if HAVE_PSF aodir = $(libdir)/$(PACKAGE) -pkglib_LTLIBRARIES = ddb_aopsf.la -ddb_aopsf_la_SOURCES = plugin.c main.c corlett.c\ +pkglib_LTLIBRARIES = ddb_ao.la +ddb_ao_la_SOURCES = plugin.c main.c corlett.c\ eng_dsf/eng_dsf.c eng_dsf/dc_hw.c eng_dsf/aica.c eng_dsf/aicadsp.c eng_dsf/arm7.c eng_dsf/arm7i.c\ eng_ssf/m68kcpu.c eng_ssf/m68kopac.c eng_ssf/m68kopdm.c eng_ssf/m68kopnz.c eng_ssf/m68kops.c \ eng_ssf/scsp.c eng_ssf/scspdsp.c eng_ssf/sat_hw.c eng_ssf/eng_ssf.c\ @@ -17,11 +17,11 @@ eng_psf/cpuintrf.h eng_psf/mamemem.h eng_psf/psx.h\ eng_psf/peops/adsr.h eng_psf/peops/dma.h eng_psf/peops/externals.h eng_psf/peops/gauss_i.h eng_psf/peops/registers.h eng_psf/peops/regs.h eng_psf/peops/spu.h eng_psf/peops/stdafx.h\ eng_psf/peops2/adsr.h eng_psf/peops2/dma.h eng_psf/peops2/externals.h eng_psf/peops2/gauss_i.h eng_psf/peops2/psemuxa.h eng_psf/peops2/registers.h eng_psf/peops2/regs.h eng_psf/peops2/reverb.h eng_psf/peops2/spu.h eng_psf/peops2/stdafx.h -ddb_aopsf_la_LDFLAGS = -module -fPIC +ddb_ao_la_LDFLAGS = -module -fPIC EXTRA_DIST=eng_psf/peops/reverb.c eng_psf/peops/adsr.c eng_psf/peops/registers.c eng_psf/peops/dma.c eng_psf/peops2/spu2.c eng_psf/peops2/reverb2.c eng_psf/peops2/adsr2.c eng_dsf/arm7memil.c eng_dsf/aicalfo.c eng_ssf/scsplfo.c -ddb_aopsf_la_LIBADD = $(LDADD) +ddb_ao_la_LIBADD = $(LDADD) AM_CFLAGS = $(CFLAGS) -Wall -DPATH_MAX=1024 -DHAS_PSXCPU=1 -I.. -Ieng_ssf -Ieng_qsf -Ieng_dsf -lm $(ZLIB_LIBS) endif diff --git a/plugins/ao/plugin.c b/plugins/ao/plugin.c index dee8c4a6..af376e66 100644 --- a/plugins/ao/plugin.c +++ b/plugins/ao/plugin.c @@ -387,7 +387,7 @@ static DB_decoder_t plugin = { }; DB_plugin_t * -ddb_aopsf_load (DB_functions_t *api) { +ddb_ao_load (DB_functions_t *api) { deadbeef = api; return DB_PLUGIN (&plugin); } diff --git a/plugins/converter/support.c b/plugins/converter/support.c index 1e6087da..06482131 100644 --- a/plugins/converter/support.c +++ b/plugins/converter/support.c @@ -158,4 +158,29 @@ GtkWidget * gtk_combo_box_text_new () { return gtk_combo_box_new_text (); } + +GtkWidget * +gtk_combo_box_text_new_with_entry (void) { + return gtk_combo_box_entry_new (); +} + +void +gtk_combo_box_text_append_text (GtkComboBoxText *combo_box, const gchar *text) { + gtk_combo_box_append_text (combo_box, text); +} + +void +gtk_combo_box_text_insert_text (GtkComboBoxText *combo_box, gint position, const gchar *text) { + gtk_combo_box_insert_text (combo_box, position, text); +} + +void +gtk_combo_box_text_prepend_text (GtkComboBoxText *combo_box, const gchar *text) { + gtk_combo_box_prepend_text (combo_box, text); +} +gchar * +gtk_combo_box_text_get_active_text (GtkComboBoxText *combo_box) { + return gtk_combo_box_get_active_text (combo_box); +} + #endif |