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

Fix some warnings.

Browse source 
git-svn-id: svn://localhost/ardour2/branches/3.0@5081 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Carl Hetherington 2009-05-15 21:36:37 +00:00
parent c9d0a19c8f
commit f4e6f8fec5
6 changed files with 64 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

14
gtk2_ardour/canvas-waveview.c
View file

@ -110,7 +110,7 @@ static void gnome_canvas_waveview_set_data_src (GnomeCanvasWaveView *,
static void gnome_canvas_waveview_set_channel (GnomeCanvasWaveView *, static void gnome_canvas_waveview_set_channel (GnomeCanvasWaveView *,
guint32); guint32);
static gint32 gnome_canvas_waveview_ensure_cache (GnomeCanvasWaveView *waveview, static guint32 gnome_canvas_waveview_ensure_cache (GnomeCanvasWaveView *waveview,
gulong start_sample, gulong start_sample,
gulong end_sample); gulong end_sample);
@ -393,7 +393,7 @@ gnome_canvas_waveview_destroy (GtkObject *object)
#undef CACHE_MEMMOVE_OPTIMIZATION #undef CACHE_MEMMOVE_OPTIMIZATION
/** @return cache index of start_sample within the cache */ /** @return cache index of start_sample within the cache */
static gint32 static guint32
gnome_canvas_waveview_ensure_cache (GnomeCanvasWaveView *waveview, gulong start_sample, gulong end_sample) gnome_canvas_waveview_ensure_cache (GnomeCanvasWaveView *waveview, gulong start_sample, gulong end_sample)
{ {
gulong required_cache_entries; gulong required_cache_entries;
@ -665,9 +665,9 @@ gnome_canvas_waveview_ensure_cache (GnomeCanvasWaveView *waveview, gulong start_
out: out:
#if DEBUG_CACHE #if DEBUG_CACHE
fprintf (stderr, "return cache index = %d\n", fprintf (stderr, "return cache index = %d\n",
(gint32) floor ((((double) (start_sample - cache->start)) / waveview->samples_per_unit) + 0.5)); (guint32) floor ((((double) (start_sample - cache->start)) / waveview->samples_per_unit) + 0.5));
#endif #endif
return (gint32) floor ((((double) (start_sample - cache->start)) / waveview->samples_per_unit) + 0.5); return (guint32) floor ((((double) (start_sample - cache->start)) / waveview->samples_per_unit) + 0.5);
} }
@ -1091,7 +1091,7 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
gulong s1, s2; gulong s1, s2;
int clip_length = 0; int clip_length = 0;
int pymin, pymax; int pymin, pymax;
int cache_index; guint cache_index;
double half_height; double half_height;
int x; int x;
char rectify; char rectify;
@ -1235,7 +1235,7 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
} }
if(last_pymax != last_pymin) { if(last_pymax != last_pymin) {
/* take the index of one sample right of what we render */ /* take the index of one sample right of what we render */
int index = cache_index + (end - begin); guint index = cache_index + (end - begin);
if (index >= waveview->cache->data_size) { if (index >= waveview->cache->data_size) {
@ -1611,7 +1611,7 @@ gnome_canvas_waveview_render (GnomeCanvasItem *item,
unsigned char zero_r, zero_g, zero_b, zero_a; unsigned char zero_r, zero_g, zero_b, zero_a;
UINT_TO_RGBA( waveview->zero_color, &zero_r, &zero_g, &zero_b, &zero_a ); UINT_TO_RGBA( waveview->zero_color, &zero_r, &zero_g, &zero_b, &zero_a );
int zeroline_y = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit); int zeroline_y = (int) rint ((item->y1 + origin) * item->canvas->pixels_per_unit);
PAINT_HORIZA(buf, zero_r, zero_g, zero_b, zero_a, zbegin, end, zeroline_y); PAINT_HORIZA(buf, zero_r, zero_g, zero_b, zero_a, zbegin, zend, zeroline_y);
} }
#undef origin #undef origin

4
gtk2_ardour/canvas-waveview.h
View file

@ -55,8 +55,8 @@ struct _GnomeCanvasWaveViewCacheEntry
struct _GnomeCanvasWaveViewCache struct _GnomeCanvasWaveViewCache
{ {
GnomeCanvasWaveViewCacheEntry* data; GnomeCanvasWaveViewCacheEntry* data;
gint32 allocated; guint32 allocated;
gint64 data_size; guint64 data_size;
gulong start; gulong start;
gulong end; gulong end;
}; };

2
gtk2_ardour/option_editor.cc
View file

@ -169,7 +169,7 @@ OptionEditor::parameter_changed (std::string const & p)
* @param o Component. * @param o Component.
*/ */
void void
OptionEditor::add (std::string const & pn, OptionEditorComponent* o) OptionEditor::add_option (std::string const & pn, OptionEditorComponent* o)
{ {
if (_pages.find (pn) == _pages.end()) { if (_pages.find (pn) == _pages.end()) {
_pages[pn] = new OptionEditorPage (_notebook, pn); _pages[pn] = new OptionEditorPage (_notebook, pn);

2
gtk2_ardour/option_editor.h
View file

@ -307,7 +307,7 @@ public:
OptionEditor (ARDOUR::Configuration *, std::string const &); OptionEditor (ARDOUR::Configuration *, std::string const &);
~OptionEditor (); ~OptionEditor ();
void add (std::string const &, OptionEditorComponent *); void add_option (std::string const &, OptionEditorComponent *);
protected: protected:

103
gtk2_ardour/rc_option_editor.cc
View file

@ -362,7 +362,6 @@ public:
_save_undo_button.set_active (x); _save_undo_button.set_active (x);
_save_undo_spin.set_sensitive (x); _save_undo_spin.set_sensitive (x);
} else if (p == "save-history-depth") { } else if (p == "save-history-depth") {
int32_t const d = _rc_config->get_saved_history_depth();
_save_undo_spin.set_value (_rc_config->get_saved_history_depth()); _save_undo_spin.set_value (_rc_config->get_saved_history_depth());
} }
} }
@ -696,7 +695,7 @@ RCOptionEditor::RCOptionEditor ()
{ {
/* MISC */ /* MISC */
add (_("Misc"), new OptionEditorHeading (_("Metering"))); add_option (_("Misc"), new OptionEditorHeading (_("Metering")));
ComboOption<float>* mht = new ComboOption<float> ( ComboOption<float>* mht = new ComboOption<float> (
"meter-hold", "meter-hold",
@ -710,7 +709,7 @@ RCOptionEditor::RCOptionEditor ()
mht->add (MeterHoldMedium, _("medium")); mht->add (MeterHoldMedium, _("medium"));
mht->add (MeterHoldLong, _("long")); mht->add (MeterHoldLong, _("long"));
add (_("Misc"), mht); add_option (_("Misc"), mht);
ComboOption<float>* mfo = new ComboOption<float> ( ComboOption<float>* mfo = new ComboOption<float> (
"meter-falloff", "meter-falloff",
@ -727,13 +726,13 @@ RCOptionEditor::RCOptionEditor ()
mfo->add (METER_FALLOFF_FASTER, _("faster")); mfo->add (METER_FALLOFF_FASTER, _("faster"));
mfo->add (METER_FALLOFF_FASTEST, _("fastest")); mfo->add (METER_FALLOFF_FASTEST, _("fastest"));
add (_("Misc"), mfo); add_option (_("Misc"), mfo);
add (_("Misc"), new OptionEditorHeading (_("Undo"))); add_option (_("Misc"), new OptionEditorHeading (_("Undo")));
add (_("Misc"), new UndoOptions (_rc_config)); add_option (_("Misc"), new UndoOptions (_rc_config));
add (_("Misc"), new OptionEditorHeading (_("Misc"))); add_option (_("Misc"), new OptionEditorHeading (_("Misc")));
ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> ( ComboOption<RemoteModel>* rm = new ComboOption<RemoteModel> (
"remote-model", "remote-model",
@ -746,14 +745,14 @@ RCOptionEditor::RCOptionEditor ()
rm->add (MixerOrdered, _("follows order of mixer")); rm->add (MixerOrdered, _("follows order of mixer"));
rm->add (EditorOrdered, _("follows order of editor")); rm->add (EditorOrdered, _("follows order of editor"));
add (_("Misc"), rm); add_option (_("Misc"), rm);
#ifndef GTKOSX #ifndef GTKOSX
/* font scaling does nothing with GDK/Quartz */ /* font scaling does nothing with GDK/Quartz */
add (_("Misc"), new FontScalingOptions (_rc_config)); add_option (_("Misc"), new FontScalingOptions (_rc_config));
#endif #endif
add (_("Misc"), add_option (_("Misc"),
new BoolOption ( new BoolOption (
"verify-remove-last-capture", "verify-remove-last-capture",
_("Verify removal of last capture"), _("Verify removal of last capture"),
@ -761,7 +760,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_verify_remove_last_capture) mem_fun (*_rc_config, &RCConfiguration::set_verify_remove_last_capture)
)); ));
add (_("Misc"), add_option (_("Misc"),
new BoolOption ( new BoolOption (
"periodic-safety-backups", "periodic-safety-backups",
_("Make periodic backups of the session file"), _("Make periodic backups of the session file"),
@ -769,7 +768,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups) mem_fun (*_rc_config, &RCConfiguration::set_periodic_safety_backups)
)); ));
add (_("Misc"), add_option (_("Misc"),
new BoolOption ( new BoolOption (
"sync-all-route-ordering", "sync-all-route-ordering",
_("Syncronise editor and mixer track order"), _("Syncronise editor and mixer track order"),
@ -777,7 +776,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_sync_all_route_ordering) mem_fun (*_rc_config, &RCConfiguration::set_sync_all_route_ordering)
)); ));
add (_("Misc"), add_option (_("Misc"),
new BoolOption ( new BoolOption (
"only-copy-imported-files", "only-copy-imported-files",
_("Always copy imported files"), _("Always copy imported files"),
@ -785,7 +784,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_only_copy_imported_files) mem_fun (*_rc_config, &RCConfiguration::set_only_copy_imported_files)
)); ));
add (_("Misc"), add_option (_("Misc"),
new BoolOption ( new BoolOption (
"default-narrow_ms", "default-narrow_ms",
_("Use narrow mixer strips"), _("Use narrow mixer strips"),
@ -793,7 +792,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms) mem_fun (*_rc_config, &RCConfiguration::set_default_narrow_ms)
)); ));
add (_("Misc"), add_option (_("Misc"),
new BoolOption ( new BoolOption (
"name-new-markers", "name-new-markers",
_("Name new markers"), _("Name new markers"),
@ -803,7 +802,7 @@ RCOptionEditor::RCOptionEditor ()
/* TRANSPORT */ /* TRANSPORT */
add (_("Transport"), add_option (_("Transport"),
new BoolOption ( new BoolOption (
"latched-record-enable", "latched-record-enable",
_("Keep record-enable engaged on stop"), _("Keep record-enable engaged on stop"),
@ -811,7 +810,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_latched_record_enable) mem_fun (*_rc_config, &RCConfiguration::set_latched_record_enable)
)); ));
add (_("Transport"), add_option (_("Transport"),
new BoolOption ( new BoolOption (
"stop-recording-on-xrun", "stop-recording-on-xrun",
_("Stop recording when an xrun occurs"), _("Stop recording when an xrun occurs"),
@ -819,7 +818,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_stop_recording_on_xrun) mem_fun (*_rc_config, &RCConfiguration::set_stop_recording_on_xrun)
)); ));
add (_("Transport"), add_option (_("Transport"),
new BoolOption ( new BoolOption (
"create-xrun-marker", "create-xrun-marker",
_("Create markers where xruns occur"), _("Create markers where xruns occur"),
@ -827,7 +826,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_create_xrun_marker) mem_fun (*_rc_config, &RCConfiguration::set_create_xrun_marker)
)); ));
add (_("Transport"), add_option (_("Transport"),
new BoolOption ( new BoolOption (
"quieten-at-speed", "quieten-at-speed",
_("Reduce output level by 12dB during fast forward / rewind"), _("Reduce output level by 12dB during fast forward / rewind"),
@ -835,7 +834,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed) mem_fun (*_rc_config, &RCConfiguration::set_quieten_at_speed)
)); ));
add (_("Transport"), add_option (_("Transport"),
new BoolOption ( new BoolOption (
"stop-at-session-end", "stop-at-session-end",
_("Stop at the end of the session"), _("Stop at the end of the session"),
@ -843,7 +842,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end) mem_fun (*_rc_config, &RCConfiguration::set_stop_at_session_end)
)); ));
add (_("Transport"), add_option (_("Transport"),
new BoolOption ( new BoolOption (
"primary-clock-delta-edit-cursor", "primary-clock-delta-edit-cursor",
_("Primary clock delta to edit cursor"), _("Primary clock delta to edit cursor"),
@ -851,7 +850,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_primary_clock_delta_edit_cursor) mem_fun (*_rc_config, &RCConfiguration::set_primary_clock_delta_edit_cursor)
)); ));
add (_("Transport"), add_option (_("Transport"),
new BoolOption ( new BoolOption (
"secondary-clock-delta-edit-cursor", "secondary-clock-delta-edit-cursor",
_("Secondary clock delta to edit cursor"), _("Secondary clock delta to edit cursor"),
@ -861,7 +860,7 @@ RCOptionEditor::RCOptionEditor ()
/* EDITOR */ /* EDITOR */
add (_("Editor"), add_option (_("Editor"),
new BoolOption ( new BoolOption (
"link-region-and-track-selection", "link-region-and-track-selection",
_("Link selection of regions and tracks"), _("Link selection of regions and tracks"),
@ -869,7 +868,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_link_region_and_track_selection) mem_fun (*_rc_config, &RCConfiguration::set_link_region_and_track_selection)
)); ));
add (_("Editor"), add_option (_("Editor"),
new BoolOption ( new BoolOption (
"automation-follows-regions", "automation-follows-regions",
_("Move relevant automation when regions are moved"), _("Move relevant automation when regions are moved"),
@ -877,7 +876,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_automation_follows_regions) mem_fun (*_rc_config, &RCConfiguration::set_automation_follows_regions)
)); ));
add (_("Editor"), add_option (_("Editor"),
new BoolOption ( new BoolOption (
"show-track-meters", "show-track-meters",
_("Show meters on tracks in the editor"), _("Show meters on tracks in the editor"),
@ -885,7 +884,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_show_track_meters) mem_fun (*_rc_config, &RCConfiguration::set_show_track_meters)
)); ));
add (_("Editor"), add_option (_("Editor"),
new BoolOption ( new BoolOption (
"use-overlap-equivalency", "use-overlap-equivalency",
_("Use overlap equivalency for regions"), _("Use overlap equivalency for regions"),
@ -893,7 +892,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_use_overlap_equivalency) mem_fun (*_rc_config, &RCConfiguration::set_use_overlap_equivalency)
)); ));
add (_("Editor"), add_option (_("Editor"),
new BoolOption ( new BoolOption (
"rubberbanding-snaps-to-grid", "rubberbanding-snaps-to-grid",
_("Make rubberband selection rectangle snap to the grid"), _("Make rubberband selection rectangle snap to the grid"),
@ -903,7 +902,7 @@ RCOptionEditor::RCOptionEditor ()
/* AUDIO */ /* AUDIO */
add (_("Audio"), new OptionEditorHeading (_("Solo"))); add_option (_("Audio"), new OptionEditorHeading (_("Solo")));
ComboOption<SoloModel>* sm = new ComboOption<SoloModel> ( ComboOption<SoloModel>* sm = new ComboOption<SoloModel> (
"solo-model", "solo-model",
@ -915,9 +914,9 @@ RCOptionEditor::RCOptionEditor ()
sm->add (InverseMute, _("in place")); sm->add (InverseMute, _("in place"));
sm->add (SoloBus, _("via bus")); sm->add (SoloBus, _("via bus"));
add (_("Audio"), sm); add_option (_("Audio"), sm);
add (_("Audio"), add_option (_("Audio"),
new BoolOption ( new BoolOption (
"solo-latched", "solo-latched",
_("Latched solo"), _("Latched solo"),
@ -925,7 +924,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_solo_latched) mem_fun (*_rc_config, &RCConfiguration::set_solo_latched)
)); ));
add (_("Audio"), add_option (_("Audio"),
new BoolOption ( new BoolOption (
"show-solo-mutes", "show-solo-mutes",
_("Show solo muting"), _("Show solo muting"),
@ -933,7 +932,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_show_solo_mutes) mem_fun (*_rc_config, &RCConfiguration::set_show_solo_mutes)
)); ));
add (_("Audio"), add_option (_("Audio"),
new BoolOption ( new BoolOption (
"solo-mute-override", "solo-mute-override",
_("Override muting"), _("Override muting"),
@ -941,7 +940,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_override) mem_fun (*_rc_config, &RCConfiguration::set_solo_mute_override)
)); ));
add (_("Audio"), new OptionEditorHeading (_("Monitoring"))); add_option (_("Audio"), new OptionEditorHeading (_("Monitoring")));
ComboOption<MonitorModel>* mm = new ComboOption<MonitorModel> ( ComboOption<MonitorModel>* mm = new ComboOption<MonitorModel> (
"monitoring-model", "monitoring-model",
@ -954,9 +953,9 @@ RCOptionEditor::RCOptionEditor ()
mm->add (SoftwareMonitoring, _("ardour")); mm->add (SoftwareMonitoring, _("ardour"));
mm->add (ExternalMonitoring, _("audio hardware")); mm->add (ExternalMonitoring, _("audio hardware"));
add (_("Audio"), mm); add_option (_("Audio"), mm);
add (_("Audio"), add_option (_("Audio"),
new BoolOption ( new BoolOption (
"tape-machine-mode", "tape-machine-mode",
_("Tape machine mode"), _("Tape machine mode"),
@ -964,7 +963,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_tape_machine_mode) mem_fun (*_rc_config, &RCConfiguration::set_tape_machine_mode)
)); ));
add (_("Audio"), new OptionEditorHeading (_("Connection of tracks and busses"))); add_option (_("Audio"), new OptionEditorHeading (_("Connection of tracks and busses")));
ComboOption<AutoConnectOption>* iac = new ComboOption<AutoConnectOption> ( ComboOption<AutoConnectOption>* iac = new ComboOption<AutoConnectOption> (
"input-auto-connect", "input-auto-connect",
@ -976,7 +975,7 @@ RCOptionEditor::RCOptionEditor ()
iac->add (AutoConnectPhysical, _("automatically to physical inputs")); iac->add (AutoConnectPhysical, _("automatically to physical inputs"));
iac->add (ManualConnect, _("manually")); iac->add (ManualConnect, _("manually"));
add (_("Audio"), iac); add_option (_("Audio"), iac);
ComboOption<AutoConnectOption>* oac = new ComboOption<AutoConnectOption> ( ComboOption<AutoConnectOption>* oac = new ComboOption<AutoConnectOption> (
"output-auto-connect", "output-auto-connect",
@ -989,11 +988,11 @@ RCOptionEditor::RCOptionEditor ()
oac->add (AutoConnectMaster, _("automatically to master outputs")); oac->add (AutoConnectMaster, _("automatically to master outputs"));
oac->add (ManualConnect, _("manually")); oac->add (ManualConnect, _("manually"));
add (_("Audio"), oac); add_option (_("Audio"), oac);
add (_("Audio"), new OptionEditorHeading (_("Denormals"))); add_option (_("Audio"), new OptionEditorHeading (_("Denormals")));
add (_("Audio"), add_option (_("Audio"),
new BoolOption ( new BoolOption (
"denormal-protection", "denormal-protection",
_("Use DC bias to protect against denormals"), _("Use DC bias to protect against denormals"),
@ -1024,11 +1023,11 @@ RCOptionEditor::RCOptionEditor ()
dm->add (DenormalFTZDAZ, _("use FlushToZero and DenormalsAreZerO")); dm->add (DenormalFTZDAZ, _("use FlushToZero and DenormalsAreZerO"));
} }
add (_("Audio"), dm); add_option (_("Audio"), dm);
add (_("Audio"), new OptionEditorHeading (_("Plugins"))); add_option (_("Audio"), new OptionEditorHeading (_("Plugins")));
add (_("Audio"), add_option (_("Audio"),
new BoolOption ( new BoolOption (
"plugins-stop-with-transport", "plugins-stop-with-transport",
_("Stop plugins when the transport is stopped"), _("Stop plugins when the transport is stopped"),
@ -1036,7 +1035,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_plugins_stop_with_transport) mem_fun (*_rc_config, &RCConfiguration::set_plugins_stop_with_transport)
)); ));
add (_("Audio"), add_option (_("Audio"),
new BoolOption ( new BoolOption (
"do-not-record-plugins", "do-not-record-plugins",
_("Disable plugins during recording"), _("Disable plugins during recording"),
@ -1044,7 +1043,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_do_not_record_plugins) mem_fun (*_rc_config, &RCConfiguration::set_do_not_record_plugins)
)); ));
add (_("Audio"), add_option (_("Audio"),
new BoolOption ( new BoolOption (
"new-plugins-active", "new-plugins-active",
_("Make new plugins active"), _("Make new plugins active"),
@ -1052,7 +1051,7 @@ RCOptionEditor::RCOptionEditor ()
mem_fun (*_rc_config, &RCConfiguration::set_new_plugins_active) mem_fun (*_rc_config, &RCConfiguration::set_new_plugins_active)
)); ));
add (_("Audio"), add_option (_("Audio"),
new BoolOption ( new BoolOption (
"auto-analyse-audio", "auto-analyse-audio",
_("Enable automatic analysis of audio"), _("Enable automatic analysis of audio"),
@ -1062,9 +1061,9 @@ RCOptionEditor::RCOptionEditor ()
/* MIDI CONTROL */ /* MIDI CONTROL */
add (_("MIDI control"), new MIDIPorts (_rc_config)); add_option (_("MIDI control"), new MIDIPorts (_rc_config));
add (_("MIDI control"), add_option (_("MIDI control"),
new SpinOption<uint8_t> ( new SpinOption<uint8_t> (
"mmc-receive-device-id", "mmc-receive-device-id",
_("Inbound MMC device ID"), _("Inbound MMC device ID"),
@ -1073,7 +1072,7 @@ RCOptionEditor::RCOptionEditor ()
0, 128, 1, 10 0, 128, 1, 10
)); ));
add (_("MIDI control"), add_option (_("MIDI control"),
new SpinOption<uint8_t> ( new SpinOption<uint8_t> (
"mmc-send-device-id", "mmc-send-device-id",
_("Outbound MMC device ID"), _("Outbound MMC device ID"),
@ -1082,7 +1081,7 @@ RCOptionEditor::RCOptionEditor ()
0, 128, 1, 10 0, 128, 1, 10
)); ));
add (_("MIDI control"), add_option (_("MIDI control"),
new SpinOption<int32_t> ( new SpinOption<int32_t> (
"initial-program-change", "initial-program-change",
_("Initial program change"), _("Initial program change"),
@ -1093,11 +1092,11 @@ RCOptionEditor::RCOptionEditor ()
/* CLICK */ /* CLICK */
add (_("Click"), new ClickOptions (_rc_config, this)); add_option (_("Click"), new ClickOptions (_rc_config, this));
/* KEYBOARD */ /* KEYBOARD */
add (_("Keyboard"), new KeyboardOptions); add_option (_("Keyboard"), new KeyboardOptions);
} }

2
libs/ardour/session_state.cc
View file

@ -852,8 +852,6 @@ Session::load_state (string snapshot_name)
int int
Session::load_options (const XMLNode& node) Session::load_options (const XMLNode& node)
{ {
XMLNode* child;
XMLProperty* prop;
LocaleGuard lg (X_("POSIX")); LocaleGuard lg (X_("POSIX"));
config.set_variables (node); config.set_variables (node);