summaryrefslogtreecommitdiff
path: root/libs/ardour
diff options
context:
space:
mode:
Diffstat (limited to 'libs/ardour')
-rw-r--r--libs/ardour/control_protocol_manager.cc4
-rw-r--r--libs/ardour/midi_ui.cc4
2 files changed, 3 insertions, 5 deletions
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);