allanger/ardour
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Activity

prevent wastebasket flush after cleanup, force wait till session reload; fix bad property names for transport controllables

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@1442 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis
2007-02-09 17:27:05 +00:00
parent 09f898d553
commit 60d516dad6
2 changed files with 26 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
gtk2_ardour/ardour_ui.cc
View File

@@ -360,16 +360,16 @@ ARDOUR_UI::set_transport_controllable_state (const XMLNode& node)
if ((prop = node.property ("stop")) != 0) {
stop_controllable.set_id (prop->value());
}
if ((prop = node.property ("goto start")) != 0) {
if ((prop = node.property ("goto_start")) != 0) {
goto_start_controllable.set_id (prop->value());
}
if ((prop = node.property ("goto end")) != 0) {
if ((prop = node.property ("goto_end")) != 0) {
goto_end_controllable.set_id (prop->value());
}
if ((prop = node.property ("auto loop")) != 0) {
if ((prop = node.property ("auto_loop")) != 0) {
auto_loop_controllable.set_id (prop->value());
}
if ((prop = node.property ("play selection")) != 0) {
if ((prop = node.property ("play_selection")) != 0) {
play_selection_controllable.set_id (prop->value());
}
if ((prop = node.property ("rec")) != 0) {
@@ -391,13 +391,13 @@ ARDOUR_UI::get_transport_controllable_state ()
stop_controllable.id().print (buf, sizeof (buf));
node->add_property (X_("stop"), buf);
goto_start_controllable.id().print (buf, sizeof (buf));
node->add_property (X_("goto start"), buf);
node->add_property (X_("goto_start"), buf);
goto_end_controllable.id().print (buf, sizeof (buf));
node->add_property (X_("goto end"), buf);
node->add_property (X_("goto_end"), buf);
auto_loop_controllable.id().print (buf, sizeof (buf));
node->add_property (X_("auto loop"), buf);
node->add_property (X_("auto_loop"), buf);
play_selection_controllable.id().print (buf, sizeof (buf));
node->add_property (X_("play selection"), buf);
node->add_property (X_("play_selection"), buf);
rec_controllable.id().print (buf, sizeof (buf));
node->add_property (X_("rec"), buf);
shuttle_controllable.id().print (buf, sizeof (buf));
@@ -2200,9 +2200,17 @@ After cleanup, unused audio files will be moved to a \
editor->prepare_for_cleanup ();
/* do not allow flush until a session is reloaded */
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("FlushWastebasket"));
if (act) {
act->set_sensitive (false);
}
if (session->cleanup_sources (rep)) {
return;
}
checker.hide();
display_cleanup_results (rep,
_("cleaned files"),
@@ -2214,6 +2222,9 @@ Flushing the wastebasket will \n\
release an additional\n\
%4 %5bytes of disk space.\n"
));
}
void

7
gtk2_ardour/ardour_ui_dialogs.cc
View File

@@ -62,6 +62,13 @@ ARDOUR_UI::connect_to_session (Session *s)
ActionManager::set_sensitive (ActionManager::range_sensitive_actions, false);
}
/* allow wastebasket flush again */
Glib::RefPtr<Action> act = ActionManager::get_action (X_("Main"), X_("FlushWastebasket"));
if (act) {
act->set_sensitive (true);
}
/* there are never any selections on startup */
ActionManager::set_sensitive (ActionManager::region_selection_sensitive_actions, false);