summaryrefslogtreecommitdiff
path: root/gtk2_ardour
diff options
context:
space:
mode:
authorTaybin Rutkin <taybin@taybin.com>2006-11-03 04:27:58 +0000
committerTaybin Rutkin <taybin@taybin.com>2006-11-03 04:27:58 +0000
commitd2d243ad08cb9588411ea85c8d08f1d19f427dc3 (patch)
treead306fb33c6f76609af48ea6a0a31873115ed5da /gtk2_ardour
parent45d35d0732e18501762dc7c9bc87b519c2590447 (diff)
Fixed snapshot dialog annoyance.
Hilight current snapshot in snapshot list with asterisks. Crash fix in sndfilesource dtor from brianahr. Thanks! Fixed COREAUDIO compilation. git-svn-id: svn://localhost/ardour2/trunk@1066 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour')
-rw-r--r--gtk2_ardour/ardour_ui.cc1
-rw-r--r--gtk2_ardour/editor.cc12
-rw-r--r--gtk2_ardour/redirect_box.cc4
3 files changed, 13 insertions, 4 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