ardour/livetrax
13
0
Fork 0
Code

remove wierd handling of edit_mode

Browse Source 
git-svn-id: svn://localhost/ardour2/trunk@928 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
Paul Davis 2006-09-25 22:38:44 +00:00
parent 361b633771
commit d8d238a6ec
1 changed files with 0 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
libs/ardour/session_state.cc
View File

@ -167,7 +167,6 @@ Session::first_stage_init (string fullpath, string snapshot_name)
g_atomic_int_set (&_capture_load, 100); g_atomic_int_set (&_capture_load, 100);
g_atomic_int_set (&_playback_load_min, 100); g_atomic_int_set (&_playback_load_min, 100);
g_atomic_int_set (&_capture_load_min, 100); g_atomic_int_set (&_capture_load_min, 100);
pending_edit_mode = Config->get_edit_mode ();
_play_range = false; _play_range = false;
waiting_to_start = false; waiting_to_start = false;
_exporting = false; _exporting = false;
@ -717,20 +716,6 @@ Session::load_options (const XMLNode& node)
Config->set_variables (node, ConfigVariableBase::Session); Config->set_variables (node, ConfigVariableBase::Session);
/* we cannot set edit mode if we are loading a session,
because it might destroy the playlist's positioning
*/
if ((child = find_named_node (node, "edit-mode")) != 0) {
if ((prop = child->property ("val")) != 0) {
if (prop->value() == "slide") {
pending_edit_mode = Slide;
} else if (prop->value() == "splice") {
pending_edit_mode = Splice;
}
}
}
if ((child = find_named_node (node, "end-marker-is-free")) != 0) { if ((child = find_named_node (node, "end-marker-is-free")) != 0) {
if ((prop = child->property ("val")) != 0) { if ((prop = child->property ("val")) != 0) {
_end_location_is_free = (prop->value() == "yes"); _end_location_is_free = (prop->value() == "yes");
@ -1167,10 +1152,6 @@ Session::set_state (const XMLNode& node)
_click_io->set_state (*child); _click_io->set_state (*child);
} }
/* OK, now we can set edit mode */
Config->set_edit_mode (pending_edit_mode);
/* here beginneth the second phase ... */ /* here beginneth the second phase ... */
StateReady (); /* EMIT SIGNAL */ StateReady (); /* EMIT SIGNAL */