diff options
| -rw-r--r-- | gtk2_ardour/ardour_ui.cc | 1 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 12 | ||||
| -rw-r--r-- | gtk2_ardour/redirect_box.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/sndfilesource.cc | 4 | ||||
| -rw-r--r-- | libs/ardour/source_factory.cc | 16 |
5 files changed, 23 insertions, 14 deletions
diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index de4eaca43e..cf5c918f37 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -1433,7 +1433,6 @@ ARDOUR_UI::snapshot_session () prompter.set_name ("Prompter"); prompter.add_button (Gtk::Stock::SAVE, Gtk::RESPONSE_ACCEPT); - prompter.set_response_sensitive (Gtk::RESPONSE_ACCEPT, false); prompter.set_prompt (_("Name of New Snapshot")); prompter.set_initial_text (now); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 68177a1118..32d4f4e658 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -4004,7 +4004,17 @@ Editor::redisplay_snapshots () for (vector<string*>::iterator i = states->begin(); i != states->end(); ++i) { string statename = *(*i); TreeModel::Row row = *(snapshot_display_model->append()); - row[snapshot_display_columns.visible_name] = statename; + + // we don't have a way of changing the rendering in just one TreeView + // cell so just put an asterisk on each side of the name for now. + string display_name; + if (statename == session->snap_name()) { + display_name = "*"+statename+"*"; + } else { + display_name = statename; + } + + row[snapshot_display_columns.visible_name] = display_name; row[snapshot_display_columns.real_name] = statename; } diff --git a/gtk2_ardour/redirect_box.cc b/gtk2_ardour/redirect_box.cc index f6b56d2f49..6153d093f3 100644 --- a/gtk2_ardour/redirect_box.cc +++ b/gtk2_ardour/redirect_box.cc @@ -973,7 +973,7 @@ RedirectBox::edit_redirect (boost::shared_ptr<Redirect> redirect) } else { ARDOUR_UI::instance()->the_editor().ensure_float (*plugin_ui); } - plugin_ui->set_title (RedirectBox::generate_redirect_title (plugin_insert)); + plugin_ui->set_title (generate_redirect_title (plugin_insert)); plugin_insert->set_gui (plugin_ui); // change window title when route name is changed @@ -1234,7 +1234,7 @@ RedirectBox::route_name_changed (void* src, PluginUIWindow* plugin_ui, boost::sh { ENSURE_GUI_THREAD(bind (mem_fun (*this, &RedirectBox::route_name_changed), src, plugin_ui, pi)); - plugin_ui->set_title (RedirectBox::generate_redirect_title (pi)); + plugin_ui->set_title (generate_redirect_title (pi)); } string diff --git a/libs/ardour/sndfilesource.cc b/libs/ardour/sndfilesource.cc index 17e45c11d7..378b62ea04 100644 --- a/libs/ardour/sndfilesource.cc +++ b/libs/ardour/sndfilesource.cc @@ -179,6 +179,8 @@ SndFileSource::init (string idstr) string::size_type pos; string file; + // lets try to keep the object initalizations here at the top + xfade_buf = 0; interleave_buf = 0; interleave_bufsize = 0; sf = 0; @@ -213,7 +215,7 @@ SndFileSource::init (string idstr) if (destructive()) { xfade_buf = new Sample[xfade_frames]; timeline_position = header_position_offset; - } + } AudioFileSource::HeaderPositionOffsetChanged.connect (mem_fun (*this, &SndFileSource::handle_header_position_change)); } diff --git a/libs/ardour/source_factory.cc b/libs/ardour/source_factory.cc index 9a3902147b..d83533ca09 100644 --- a/libs/ardour/source_factory.cc +++ b/libs/ardour/source_factory.cc @@ -122,16 +122,14 @@ SourceFactory::createReadable (Session& s, string idstr, AudioFileSource::Flag f } else { - catch (failed_constructor& err) { - boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags)); - if (setup_peakfile (ret)) { - return boost::shared_ptr<Source>(); - } - if (announce) { - SourceCreated (ret); - } - return ret; + boost::shared_ptr<Source> ret (new SndFileSource (s, idstr, flags)); + if (setup_peakfile (ret)) { + return boost::shared_ptr<Source>(); + } + if (announce) { + SourceCreated (ret); } + return ret; } return boost::shared_ptr<Source>(); |