Convert some error output to debug output in PortaudioBackend

[ardour.git] / libs / surfaces / control_protocol / basic_ui.cc

diff --git a/libs/surfaces/control_protocol/basic_ui.cc b/libs/surfaces/control_protocol/basic_ui.cc
index ebef517d8a6cf1e370be7806f24349c27cb46ea8..bf6bb25f2cac17fd7900078299c0e8bef08dde75 100644 (file)
--- a/libs/surfaces/control_protocol/basic_ui.cc
+++ b/libs/surfaces/control_protocol/basic_ui.cc
@@ -19,6 +19,7 @@
 */
 
 #include "pbd/pthread_utils.h"
+#include "pbd/memento_command.h"
 
 #include "ardour/session.h"
 #include "ardour/location.h"
@@ -78,6 +79,20 @@ BasicUI::loop_toggle ()
        }
 }
 
+void
+BasicUI::loop_location (framepos_t start, framepos_t end)
+{
+       Location* tll;
+       if ((tll = session->locations()->auto_loop_location()) == 0) {
+               Location* loc = new Location (*session, start, end, _("Loop"),  Location::IsAutoLoop);
+               session->locations()->add (loc, true);
+               session->set_auto_loop_location (loc);
+       } else {
+               tll->set_hidden (false, this);
+               tll->set (start, end);
+       }
+}
+
 void
 BasicUI::goto_start ()
 {
@@ -91,16 +106,22 @@ BasicUI::goto_end ()
 }
 
 void       
-BasicUI::add_marker ()
+BasicUI::add_marker (const std::string& markername)
 {
-       framepos_t when = session->audible_frame();
-       session->locations()->add (new Location (*session, when, when, _("unnamed"), Location::IsMark));
+       framepos_t where = session->audible_frame();
+       Location *location = new Location (*session, where, where, markername, Location::IsMark);
+       session->begin_reversible_command (_("add marker"));
+       XMLNode &before = session->locations()->get_state();
+       session->locations()->add (location, true);
+       XMLNode &after = session->locations()->get_state();
+       session->add_command (new MementoCommand<Locations>(*(session->locations()), &before, &after));
+       session->commit_reversible_command ();
 }
 
 void
 BasicUI::rewind ()
 {
-       session->request_transport_speed (session->transport_speed() * 1.5);
+       session->request_transport_speed (session->transport_speed() - 1.5);
 }
 
 void
@@ -164,10 +185,10 @@ BasicUI::save_state ()
 void
 BasicUI::prev_marker ()
 {
-       Location *location = session->locations()->first_location_before (session->transport_frame());
+       framepos_t pos = session->locations()->first_mark_before (session->transport_frame());
        
-       if (location) {
-               session->request_locate (location->start(), session->transport_rolling());
+       if (pos >= 0) {
+               session->request_locate (pos, session->transport_rolling());
        } else {
                session->goto_start ();
        }
@@ -176,12 +197,12 @@ BasicUI::prev_marker ()
 void
 BasicUI::next_marker ()
 {
-       Location *location = session->locations()->first_location_after (session->transport_frame());
+       framepos_t pos = session->locations()->first_mark_after (session->transport_frame());
 
-       if (location) {
-               session->request_locate (location->start(), session->transport_rolling());
+       if (pos >= 0) {
+               session->request_locate (pos, session->transport_rolling());
        } else {
-               session->request_locate (session->current_end_frame());
+               session->goto_end();
        }
 }