# HG changeset patch # User nenolod # Date 1162109610 25200 # Node ID 52c85b72354bc662bbf6171245ac2f70e93a4ddc # Parent 6b5a52635b3b44c8d1a02765ea3b213854626f4a [svn] - convert to use configdb system diff -r 6b5a52635b3b -r 52c85b72354b ChangeLog --- a/ChangeLog Sun Oct 29 01:04:52 2006 -0700 +++ b/ChangeLog Sun Oct 29 01:13:30 2006 -0700 @@ -1,3 +1,48 @@ +2006-10-29 08:04:52 +0000 William Pitcock + revision [272] + - like with so many other things, modplug is now maintained by us. + + trunk/configure.ac | 7 + trunk/src/modplug/Makefile | 37 + trunk/src/modplug/fastmix.cxx | 2370 ++++++++++++++++++++++++++++++++++++++++ + trunk/src/modplug/it_defs.h | 134 ++ + trunk/src/modplug/load_669.cxx | 186 +++ + trunk/src/modplug/load_amf.cxx | 420 +++++++ + trunk/src/modplug/load_ams.cxx | 628 ++++++++++ + trunk/src/modplug/load_dbm.cxx | 368 ++++++ + trunk/src/modplug/load_dmf.cxx | 606 ++++++++++ + trunk/src/modplug/load_dsm.cxx | 236 ++++ + trunk/src/modplug/load_far.cxx | 270 ++++ + trunk/src/modplug/load_it.cxx | 1511 +++++++++++++++++++++++++ + trunk/src/modplug/load_j2b.cxx | 15 + trunk/src/modplug/load_mdl.cxx | 503 ++++++++ + trunk/src/modplug/load_med.cxx | 916 +++++++++++++++ + trunk/src/modplug/load_mod.cxx | 498 ++++++++ + trunk/src/modplug/load_mt2.cxx | 635 ++++++++++ + trunk/src/modplug/load_mtm.cxx | 164 ++ + trunk/src/modplug/load_okt.cxx | 197 +++ + trunk/src/modplug/load_psm.cxx | 839 ++++++++++++++ + trunk/src/modplug/load_ptm.cxx | 207 +++ + trunk/src/modplug/load_s3m.cxx | 650 +++++++++++ + trunk/src/modplug/load_stm.cxx | 186 +++ + trunk/src/modplug/load_ult.cxx | 222 +++ + trunk/src/modplug/load_umx.cxx | 53 + trunk/src/modplug/load_wav.cxx | 220 +++ + trunk/src/modplug/load_xm.cxx | 892 +++++++++++++++ + trunk/src/modplug/mmcmp.cxx | 406 ++++++ + trunk/src/modplug/modplug.cxx | 271 ++++ + trunk/src/modplug/modplug.h | 168 ++ + trunk/src/modplug/snd_dsp.cxx | 485 ++++++++ + trunk/src/modplug/snd_flt.cxx | 101 + + trunk/src/modplug/snd_fx.cxx | 2391 +++++++++++++++++++++++++++++++++++++++++ + trunk/src/modplug/sndfile.cxx | 1877 ++++++++++++++++++++++++++++++++ + trunk/src/modplug/sndfile.h | 1005 +++++++++++++++++ + trunk/src/modplug/sndmix.cxx | 1245 +++++++++++++++++++++ + trunk/src/modplug/stdafx.h | 175 +++ + trunk/src/modplug/tables.cxx | 377 ++++++ + 38 files changed, 21465 insertions(+), 6 deletions(-) + + 2006-10-29 01:08:06 +0000 Aaron Sheldon revision [270] Adds mplayer controls the plugin pack. I don't know crap about diff -r 6b5a52635b3b -r 52c85b72354b src/mplayer/common.c --- a/src/mplayer/common.c Sun Oct 29 01:04:52 2006 -0700 +++ b/src/mplayer/common.c Sun Oct 29 01:13:30 2006 -0700 @@ -1,19 +1,20 @@ -#include +#include #include "xmmsmplayer.h" struct mplayer_cfg *mplayer_read_cfg(){ - RcFile *cfg; + ConfigDb *cfg; struct mplayer_cfg *new_cfg; new_cfg=(struct mplayer_cfg *)malloc(sizeof(struct mplayer_cfg)); memset(new_cfg,0,sizeof(struct mplayer_cfg)); - cfg = bmp_rcfile_open("what"); - bmp_rcfile_read_int(cfg,"xmms-mplayer","vo",&(new_cfg->vo)); - bmp_rcfile_read_int(cfg,"xmms-mplayer","ao",&(new_cfg->ao)); - bmp_rcfile_read_bool(cfg,"xmms-mplayer","zoom",&(new_cfg->zoom)); - bmp_rcfile_read_bool(cfg,"xmms-mplayer","framedrop",&(new_cfg->framedrop)); - bmp_rcfile_read_bool(cfg,"xmms-mplayer","idx",&(new_cfg->idx)); - bmp_rcfile_read_bool(cfg,"xmms-mplayer","onewin",&(new_cfg->onewin)); - bmp_rcfile_read_bool(cfg,"xmms-mplayer","xmmsaudio",&(new_cfg->xmmsaudio)); - bmp_rcfile_read_string(cfg,"xmms-mplayer","extra",&(new_cfg->extra)); + cfg = bmp_cfg_db_open(); + bmp_cfg_db_get_int(cfg,"xmms-mplayer","vo",&(new_cfg->vo)); + bmp_cfg_db_get_int(cfg,"xmms-mplayer","ao",&(new_cfg->ao)); + bmp_cfg_db_get_bool(cfg,"xmms-mplayer","zoom",&(new_cfg->zoom)); + bmp_cfg_db_get_bool(cfg,"xmms-mplayer","framedrop",&(new_cfg->framedrop)); + bmp_cfg_db_get_bool(cfg,"xmms-mplayer","idx",&(new_cfg->idx)); + bmp_cfg_db_get_bool(cfg,"xmms-mplayer","onewin",&(new_cfg->onewin)); + bmp_cfg_db_get_bool(cfg,"xmms-mplayer","xmmsaudio",&(new_cfg->xmmsaudio)); + bmp_cfg_db_get_string(cfg,"xmms-mplayer","extra",&(new_cfg->extra)); + bmp_cfg_db_close(cfg); return new_cfg; } diff -r 6b5a52635b3b -r 52c85b72354b src/mplayer/interface.c --- a/src/mplayer/interface.c Sun Oct 29 01:04:52 2006 -0700 +++ b/src/mplayer/interface.c Sun Oct 29 01:13:30 2006 -0700 @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include #include "xmmsmplayer.h" @@ -48,7 +48,7 @@ void on_btn_ok_clicked (GtkButton *button, gpointer user_data){ - RcFile *cfg; + ConfigDb *cfg; struct mplayer_cfg new_cfg; if(gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(vo_none))) new_cfg.vo=MPLAYER_VO_NONE; @@ -82,19 +82,16 @@ new_cfg.ao=MPLAYER_AO_XMMS; new_cfg.extra=gtk_entry_get_text(GTK_ENTRY(entry_extra_opts)); -// cfg = xmms_cfg_open_default_file(); - cfg=bmp_rcfile_open("what"); - bmp_rcfile_write_int(cfg,"xmms-mplayer","vo",new_cfg.vo); - bmp_rcfile_write_int(cfg,"xmms-mplayer","ao",new_cfg.ao); - bmp_rcfile_write_boolean(cfg,"xmms-mplayer","zoom",new_cfg.zoom); - bmp_rcfile_write_boolean(cfg,"xmms-mplayer","framedrop",new_cfg.framedrop); - bmp_rcfile_write_boolean(cfg,"xmms-mplayer","idx",new_cfg.idx); - bmp_rcfile_write_boolean(cfg,"xmms-mplayer","onewin",new_cfg.onewin); - bmp_rcfile_write_boolean(cfg,"xmms-mplayer","xmmsaudio",new_cfg.xmmsaudio); - bmp_rcfile_write_string(cfg,"xmms-mplayer","extra",new_cfg.extra); - bmp_rcfile_write(cfg, "what"); -// xmms_cfg_write_default_file(cfg); - bmp_rcfile_free(cfg); + cfg = bmp_cfg_db_open(); + bmp_cfg_db_set_int(cfg,"xmms-mplayer","vo",new_cfg.vo); + bmp_cfg_db_set_int(cfg,"xmms-mplayer","ao",new_cfg.ao); + bmp_cfg_db_set_bool(cfg,"xmms-mplayer","zoom",new_cfg.zoom); + bmp_cfg_db_set_bool(cfg,"xmms-mplayer","framedrop",new_cfg.framedrop); + bmp_cfg_db_set_bool(cfg,"xmms-mplayer","idx",new_cfg.idx); + bmp_cfg_db_set_bool(cfg,"xmms-mplayer","onewin",new_cfg.onewin); + bmp_cfg_db_set_bool(cfg,"xmms-mplayer","xmmsaudio",new_cfg.xmmsaudio); + bmp_cfg_db_set_string(cfg,"xmms-mplayer","extra",new_cfg.extra); + bmp_cfg_db_close(cfg); gtk_widget_destroy(mplayer_configure_win); mplayer_configure_win=NULL;