smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2025-12-26 00:17:49 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Made hdd buffering parameters casting to be performed more correct way

Browse source 
[Reviewed by] Paul Davis
This commit is contained in:
GZharun 2015-01-28 10:28:25 +02:00
parent dea6a54661
commit bc6fefc839
3 changed files with 5 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

7
gtk2_ardour/tracks_control_panel.logic.cc
View file

@ -1205,7 +1205,10 @@ TracksControlPanel::save_general_preferences ()
Config->set_history_depth (_limit_undo_history_spinbutton.get_value ());
Config->set_saved_history_depth (_save_undo_history_spinbutton.get_value ());
Config->set_save_history (_save_undo_history_spinbutton.get_value () > 0);
Config->set_buffering_preset (string_to_hdd_buffering_preset (_hard_disk_buffering_dropdown.get_text ()));
BufferingPreset preset;
preset = (BufferingPreset)string_2_enum (_hard_disk_buffering_dropdown.get_text (), preset);
Config->set_buffering_preset (preset);
}
void TracksControlPanel::on_engine_dropdown_item_clicked (WavesDropdown*, int)
@ -1767,7 +1770,7 @@ TracksControlPanel::on_parameter_changed (const std::string& parameter_name)
display_meter_hold ();
} else if (parameter_name == "meter-falloff") {
display_meter_falloff ();
} else if (parameter_name == "capture-buffer-seconds") {
} else if (parameter_name == "buffering-preset") {
display_hdd_buffering ();
} else if (parameter_name == "mmc-control") {
display_mmc_control ();

3
libs/ardour/ardour/utils.h
View file

@ -75,9 +75,6 @@ LIBARDOUR_API ARDOUR::SyncSource string_to_sync_source (std::string str);
LIBARDOUR_API const char* edit_mode_to_string (ARDOUR::EditMode);
LIBARDOUR_API ARDOUR::EditMode string_to_edit_mode (std::string);
LIBARDOUR_API ARDOUR::BufferingPreset string_to_hdd_buffering_preset (const std::string& str);
LIBARDOUR_API const char* hdd_buffering_preset_to_string (BufferingPreset preset);
#undef OLD_GAIN_MATH
#define OLD_GAIN_MATH

33
libs/ardour/utils.cc
View file

@ -504,39 +504,6 @@ ARDOUR::sync_source_to_string (SyncSource src, bool sh)
return _("JACK");
}
BufferingPreset
ARDOUR::string_to_hdd_buffering_preset (const string& str)
{
if (str == _("Small")) {
return Small;
} else if (str == _("Medium")) {
return Medium;
} else if (str == _("Large")) {
return Large;
}
fatal << string_compose (_("programming error: unknown buffering preset \"%1\""), str) << endmsg;
/*NOTREACHED*/
return Small;
}
const char*
ARDOUR::hdd_buffering_preset_to_string (BufferingPreset preset)
{
switch (preset) {
case Small:
return _("Small");
case Medium:
return _("Medium");
case Large:
return _("Large");
}
/* GRRRR .... stupid, stupid gcc - you can't get here from there, all enum values are handled */
return _("Small");
}
float
ARDOUR::meter_falloff_to_float (MeterFalloff falloff)
{