diff options
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 7 | ||||
| -rw-r--r-- | libs/ardour/control_protocol_manager.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/midi_ui.cc | 4 | ||||
| -rw-r--r-- | libs/surfaces/osc/osc.cc | 4 |
4 files changed, 6 insertions, 13 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index dc788dd35e..7f1391a640 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -1180,13 +1180,10 @@ MixerStrip::update_io_button (boost::shared_ptr<ARDOUR::Route> route, Width widt break; } - label_cstr = new char[label_string.size() + 1]; - strcpy(label_cstr, label_string.c_str()); - if (for_input) { - input_label.set_text (label_cstr); + input_label.set_text (label_string); } else { - output_label.set_text (label_cstr); + output_label.set_text (label_string); } } diff --git a/libs/ardour/control_protocol_manager.cc b/libs/ardour/control_protocol_manager.cc index 1e793bb71b..662d41064a 100644 --- a/libs/ardour/control_protocol_manager.cc +++ b/libs/ardour/control_protocol_manager.cc @@ -210,12 +210,12 @@ ControlProtocolManager::control_protocol_discover (string path) if ((descriptor = get_descriptor (path)) != 0) { - ControlProtocolInfo* cpi = new ControlProtocolInfo (); - if (!descriptor->probe (descriptor)) { info << string_compose (_("Control protocol %1 not usable"), descriptor->name) << endmsg; } else { + ControlProtocolInfo* cpi = new ControlProtocolInfo (); + cpi->descriptor = descriptor; cpi->name = descriptor->name; cpi->path = path; diff --git a/libs/ardour/midi_ui.cc b/libs/ardour/midi_ui.cc index fecbf9b8e3..2b39d6c032 100644 --- a/libs/ardour/midi_ui.cc +++ b/libs/ardour/midi_ui.cc @@ -154,9 +154,7 @@ MidiControlUI::thread_init () { struct sched_param rtparam; - char* c = new char[7]; - strcpy (c, X_("midiUI")); - pthread_set_name (c); + pthread_set_name (X_("midiUI")); PBD::notify_gui_about_thread_creation (X_("gui"), pthread_self(), X_("MIDI"), 2048); SessionEvent::create_per_thread_pool (X_("MIDI I/O"), 128); diff --git a/libs/surfaces/osc/osc.cc b/libs/surfaces/osc/osc.cc index aa98470829..8eff8e0e1b 100644 --- a/libs/surfaces/osc/osc.cc +++ b/libs/surfaces/osc/osc.cc @@ -224,9 +224,7 @@ OSC::start () void OSC::thread_init () { - char* c = new char[4]; - strcpy (c, X_("OSC")); - pthread_set_name (c); + pthread_set_name (X_("OSC")); if (_osc_unix_server) { Glib::RefPtr<IOSource> src = IOSource::create (lo_server_get_socket_fd (_osc_unix_server), IO_IN|IO_HUP|IO_ERR); |