#include "tooltips.h"
#include "ui_config.h"
-#include "i18n.h"
+#include "pbd/i18n.h"
using namespace std;
using namespace ARDOUR;
return;
}
+ const int32_t divisions = PublicEditor::instance().get_grid_music_divisions (0);
+
switch (part) {
case LocStart:
- location->set_start (_session->transport_frame ());
+ location->set_start (_session->transport_frame (), false, true, divisions);
break;
case LocEnd:
- location->set_end (_session->transport_frame ());
+ location->set_end (_session->transport_frame (), false, true,divisions);
+ if (location->is_session_range()) {
+ _session->set_end_is_free (false);
+ }
break;
default:
break;
return;
}
+ const int32_t divisions = PublicEditor::instance().get_grid_music_divisions (0);
+
switch (part) {
case LocStart:
- location->set_start (start_clock.current_time());
+ location->set_start (start_clock.current_time(), false, true, divisions);
break;
case LocEnd:
- location->set_end (end_clock.current_time());
+ location->set_end (end_clock.current_time(), false, true, divisions);
+ if (location->is_session_range()) {
+ _session->set_end_is_free (false);
+ }
break;
case LocLength:
- location->set_end (location->start() + length_clock.current_duration());
+ location->set_end (location->start() + length_clock.current_duration(), false, true, divisions);
+ if (location->is_session_range()) {
+ _session->set_end_is_free (false);
+ }
default:
break;
}
/*------------------------------------------------------------------------*/
-LocationUI::LocationUI ()
+LocationUI::LocationUI (std::string state_node_name)
: add_location_button (_("New Marker"))
, add_range_button (_("New Range"))
+ , _mode (AudioClock::Frames)
+ , _mode_set (false)
+ , _state_node_name (state_node_name)
{
i_am_the_modifier = 0;
_session->locations()->changed.connect (_session_connections, invalidator (*this), boost::bind (&LocationUI::refresh_location_list, this), gui_context());
_clock_group->set_clock_mode (clock_mode_from_session_instant_xml ());
+ } else {
+ _mode_set = false;
}
loop_edit_row.set_session (s);
punch_edit_row.set_session (0);
punch_edit_row.set_location (0);
+ _mode_set = false;
+
SessionHandlePtr::session_going_away ();
}
XMLNode &
LocationUI::get_state () const
{
- XMLNode* node = new XMLNode (X_("LocationUI"));
- node->add_property (X_("clock-mode"), enum_2_string (_clock_group->clock_mode ()));
+ XMLNode* node = new XMLNode (_state_node_name);
+ if (_mode_set) {
+ node->add_property (X_("clock-mode"), enum_2_string (_mode));
+ } else {
+ node->add_property (X_("clock-mode"), enum_2_string (_clock_group->clock_mode ()));
+ }
return *node;
}
+int
+LocationUI::set_state (const XMLNode& node)
+{
+ if (node.name() != _state_node_name) {
+ return -1;
+ }
+ XMLProperty const* p = node.property (X_("clock-mode"));
+ if (!p) {
+ return -1;
+ }
+ _mode = (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode);
+ _mode_set = true;
+ if (_clock_group) {
+ _clock_group->set_clock_mode (_mode);
+ }
+ return 0;
+}
+
AudioClock::Mode
-LocationUI::clock_mode_from_session_instant_xml () const
+LocationUI::clock_mode_from_session_instant_xml ()
{
- XMLNode* node = _session->instant_xml (X_("LocationUI"));
+ if (_mode_set) {
+ return _mode;
+ }
+
+ XMLNode* node = _session->instant_xml (_state_node_name);
if (!node) {
return AudioClock::Frames;
}
return ARDOUR_UI::instance()->secondary_clock->mode();
}
- return (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode);
+ _mode = (AudioClock::Mode) string_2_enum (p->value (), AudioClock::Mode);
+ _mode_set = true;
+ return _mode;
}
/*------------------------*/
LocationUIWindow::LocationUIWindow ()
- : ArdourWindow (_("Locations"))
+ : ArdourWindow (S_("Ranges|Locations"))
{
set_wmclass(X_("ardour_locations"), PROGRAM_NAME);
set_name ("LocationWindow");