fix incorrect accumulation of export video options each time the dialog is used

[ardour.git] / gtk2_ardour / location_ui.cc

diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc
index 0f9af3ff568daef36a85b6322cf4683a2cc16783..7f658b9816c13b4ae27dd44968b85c491e275234 100644 (file)
--- a/gtk2_ardour/location_ui.cc
+++ b/gtk2_ardour/location_ui.cc
@@ -24,6 +24,7 @@
 
 #include "ardour/session.h"
 #include "pbd/memento_command.h"
+#include "widgets/tooltips.h"
 
 #include "ardour_ui.h"
 #include "clock_group.h"
@@ -32,17 +33,15 @@
 #include "gui_thread.h"
 #include "keyboard.h"
 #include "location_ui.h"
-#include "prompter.h"
 #include "utils.h"
 #include "public_editor.h"
-#include "tooltips.h"
 #include "ui_config.h"
 
 #include "pbd/i18n.h"
 
 using namespace std;
 using namespace ARDOUR;
-using namespace ARDOUR_UI_UTILS;
+using namespace ArdourWidgets;
 using namespace PBD;
 using namespace Gtk;
 using namespace Gtkmm2ext;
@@ -285,7 +284,7 @@ LocationEditRow::set_location (Location *loc)
                cd_check_button.set_active (location->is_cd_marker());
                cd_check_button.show();
 
-               if (location->start() == _session->current_start_frame()) {
+               if (location->start() == _session->current_start_sample()) {
                        cd_check_button.set_sensitive (false);
                } else {
                        cd_check_button.set_sensitive (true);
@@ -419,10 +418,10 @@ LocationEditRow::to_playhead_button_pressed (LocationPart part)
 
        switch (part) {
                case LocStart:
-                       location->set_start (_session->transport_frame (), false, true, divisions);
+                       location->set_start (_session->transport_sample (), false, true, divisions);
                        break;
                case LocEnd:
-                       location->set_end (_session->transport_frame (), false, true,divisions);
+                       location->set_end (_session->transport_sample (), false, true,divisions);
                        if (location->is_session_range()) {
                                _session->set_end_is_free (false);
                        }
@@ -525,7 +524,7 @@ LocationEditRow::cd_toggled ()
        //}
 
        if (cd_check_button.get_active()) {
-               if (location->start() <= _session->current_start_frame()) {
+               if (location->start() <= _session->current_start_sample()) {
                        error << _("You cannot put a CD marker at the start of the session") << endmsg;
                        cd_check_button.set_active (false);
                        return;
@@ -647,7 +646,7 @@ LocationEditRow::start_changed ()
 
        start_clock.set (location->start());
 
-       if (location->start() == _session->current_start_frame()) {
+       if (location->start() == _session->current_start_sample()) {
                cd_check_button.set_sensitive (false);
        } else {
                cd_check_button.set_sensitive (true);
@@ -754,7 +753,7 @@ LocationEditRow::set_clock_editable_status ()
 LocationUI::LocationUI (std::string state_node_name)
        : add_location_button (_("New Marker"))
        , add_range_button (_("New Range"))
-       , _mode (AudioClock::Frames)
+       , _mode (AudioClock::Samples)
        , _mode_set (false)
        , _state_node_name (state_node_name)
 {
@@ -1048,7 +1047,7 @@ LocationUI::add_new_location()
        string markername;
 
        if (_session) {
-               framepos_t where = _session->audible_frame();
+               samplepos_t where = _session->audible_sample();
                _session->locations()->next_available_name(markername,"mark");
                Location *location = new Location (*_session, where, where, markername, Location::IsMark);
                if (UIConfiguration::instance().get_name_new_markers()) {
@@ -1070,7 +1069,7 @@ LocationUI::add_new_range()
        string rangename;
 
        if (_session) {
-               framepos_t where = _session->audible_frame();
+               samplepos_t where = _session->audible_sample();
                _session->locations()->next_available_name(rangename,"unnamed");
                Location *location = new Location (*_session, where, where, rangename, Location::IsRangeMarker);
                PublicEditor::instance().begin_reversible_command (_("add range marker"));
@@ -1181,11 +1180,11 @@ LocationUI::clock_mode_from_session_instant_xml ()
 
        XMLNode* node = _session->instant_xml (_state_node_name);
        if (!node) {
-               return ARDOUR_UI::instance()->secondary_clock->mode();
+               return ARDOUR_UI::instance()->primary_clock->mode();
        }
 
        if (!node->get_property (X_("clock-mode"), _mode)) {
-               return ARDOUR_UI::instance()->secondary_clock->mode();
+               return ARDOUR_UI::instance()->primary_clock->mode();
        }
 
        _mode_set = true;