Mercurial > audlegacy-plugins
changeset 1499:799f92d815b2
removed NSFE playlist option (which was marked TODO)
| author | mf0102 <0102@gmx.at> |
|---|---|
| date | Thu, 16 Aug 2007 15:52:26 +0200 |
| parents | a1fccf242404 |
| children | 611d8db6b421 |
| files | src/console/Audacious_Config.cxx src/console/Audacious_Config.h src/console/Audacious_Driver.cxx |
| diffstat | 3 files changed, 2 insertions(+), 22 deletions(-) [+] |
line wrap: on
line diff
--- a/src/console/Audacious_Config.cxx Thu Aug 16 14:47:14 2007 +0200 +++ b/src/console/Audacious_Config.cxx Thu Aug 16 15:52:26 2007 +0200 @@ -26,7 +26,6 @@ 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); - bmp_cfg_db_get_bool(db, "console", "nsfe_playlist", &audcfg.nsfe_playlist); bmp_cfg_db_get_int(db, "console", "treble", &audcfg.treble); bmp_cfg_db_get_int(db, "console", "bass", &audcfg.bass); bmp_cfg_db_get_bool(db, "console", "ignore_spc_length", &audcfg.ignore_spc_length); @@ -42,7 +41,6 @@ bmp_cfg_db_set_int(db, "console", "loop_length", audcfg.loop_length); bmp_cfg_db_set_bool(db, "console", "resample", audcfg.resample); bmp_cfg_db_set_int(db, "console", "resample_rate", audcfg.resample_rate); - bmp_cfg_db_set_bool(db, "console", "nsfe_playlist", audcfg.nsfe_playlist); bmp_cfg_db_set_int(db, "console", "treble", audcfg.treble); bmp_cfg_db_set_int(db, "console", "bass", audcfg.bass); bmp_cfg_db_set_bool(db, "console", "ignore_spc_length", audcfg.ignore_spc_length); @@ -79,11 +77,6 @@ audcfg.loop_length = (gint)gtk_spin_button_get_value( GTK_SPIN_BUTTON(spbt) ); } -static void i_cfg_ev_nsfeoptpl_enable_commit( gpointer cbt ) -{ - audcfg.nsfe_playlist = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(cbt) ); -} - static void i_cfg_ev_ignorespclen_enable_commit( gpointer cbt ) { audcfg.ignore_spc_length = gtk_toggle_button_get_active( GTK_TOGGLE_BUTTON(cbt) ); @@ -111,7 +104,7 @@ { static GtkWidget *configwin = NULL; GtkWidget *configwin_vbox; - GtkWidget *configwin_gen_vbox, *configwin_nsf_vbox, *configwin_spc_vbox; + GtkWidget *configwin_gen_vbox, *configwin_spc_vbox; GtkWidget *configwin_gen_resample_frame, *configwin_gen_resample_vbox; GtkWidget *configwin_gen_resample_cbt, *configwin_gen_resample_val_hbox; GtkWidget *configwin_gen_resample_val_spbt; @@ -120,7 +113,6 @@ GtkWidget *configwin_gen_playback_tb_bass_hbox, *configwin_gen_playback_tb_bass_spbt; GtkWidget *configwin_gen_playback_tb_treble_hbox, *configwin_gen_playback_tb_treble_spbt; GtkWidget *configwin_gen_playback_deflen_hbox, *configwin_gen_playback_deflen_spbt; - GtkWidget *configwin_nsf_nsfeoptpl_cbt; GtkWidget *configwin_spc_ignorespclen_cbt, *configwin_spc_increverb_cbt; GtkWidget /* *hseparator, */ *hbuttonbox, *button_ok, *button_cancel; GtkWidget *configwin_notebook; @@ -237,17 +229,6 @@ G_CALLBACK(i_cfg_ev_toggle_resample) , configwin_gen_resample_val_hbox ); gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(configwin_gen_resample_cbt) , audcfg.resample ); - // NSF/NSFE PAGE - configwin_nsf_vbox = gtk_vbox_new( FALSE , 3 ); - gtk_container_set_border_width( GTK_CONTAINER(configwin_nsf_vbox), 5 ); - gtk_notebook_append_page( GTK_NOTEBOOK(configwin_notebook) , - configwin_nsf_vbox , gtk_label_new( _("NSF/NSFE") ) ); - configwin_nsf_nsfeoptpl_cbt = gtk_check_button_new_with_label( _("Use optional NSFE playlist") ); - gtk_toggle_button_set_active( GTK_TOGGLE_BUTTON(configwin_nsf_nsfeoptpl_cbt) , audcfg.nsfe_playlist ); - g_signal_connect_swapped( G_OBJECT(button_ok) , "clicked" , - G_CALLBACK(i_cfg_ev_nsfeoptpl_enable_commit) , configwin_nsf_nsfeoptpl_cbt ); - gtk_box_pack_start( GTK_BOX(configwin_nsf_vbox) , - configwin_nsf_nsfeoptpl_cbt , FALSE , FALSE , 0 ); // SPC PAGE configwin_spc_vbox = gtk_vbox_new( FALSE , 3 );
--- a/src/console/Audacious_Config.h Thu Aug 16 14:47:14 2007 +0200 +++ b/src/console/Audacious_Config.h Thu Aug 16 15:52:26 2007 +0200 @@ -17,7 +17,6 @@ gint loop_length; // length of tracks that lack timing information gboolean resample; // whether or not to resample gint resample_rate; // rate to resample at - gboolean nsfe_playlist; // TODO: remove (nsfe playlist is now always enabled) gint treble; // -100 to +100 gint bass; // -100 to +100 gboolean ignore_spc_length; // if true, ignore length from SPC tags
--- a/src/console/Audacious_Driver.cxx Thu Aug 16 14:47:14 2007 +0200 +++ b/src/console/Audacious_Driver.cxx Thu Aug 16 15:52:26 2007 +0200 @@ -36,7 +36,7 @@ int const path_max = 4096; AudaciousConsoleConfig audcfg = -{ 180, FALSE, 32000, TRUE, 0, 0, FALSE, 0, FALSE }; +{ 180, FALSE, 32000, 0, 0, FALSE, 0, FALSE }; static GThread* decode_thread; static GStaticMutex playback_mutex = G_STATIC_MUTEX_INIT; static int console_ip_is_going;