fix compiler warnings.

[ardour.git] / gtk2_ardour / editor_markers.cc

diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc
index 96ae8e66e0eaa1fe280af930d7e0029e21be8c2f..3bca0ad935d50af93d101e7f427dd65b75997879 100644 (file)
--- a/gtk2_ardour/editor_markers.cc
+++ b/gtk2_ardour/editor_markers.cc
@@ -17,7 +17,6 @@
 
 */
 
-#include <sigc++/retype.h>
 #include <cstdlib>
 #include <cmath>
 
@@ -154,11 +153,11 @@ Editor::add_new_location_internal (Location* location)
                lam->show ();
        }
 
-       location->start_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
-       location->end_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
-       location->changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
-       location->name_changed.connect (*this, invalidator (*this), ui_bind (&Editor::location_changed, this, _1), gui_context());
-       location->FlagsChanged.connect (*this, invalidator (*this), ui_bind (&Editor::location_flags_changed, this, _1, _2), gui_context());
+       location->start_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+       location->end_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+       location->changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+       location->name_changed.connect (*this, invalidator (*this), boost::bind (&Editor::location_changed, this, _1), gui_context());
+       location->FlagsChanged.connect (*this, invalidator (*this), boost::bind (&Editor::location_flags_changed, this, _1, _2), gui_context());
 
        pair<Location*,LocationMarkers*> newpair;
 
@@ -661,6 +660,31 @@ Editor::mouse_add_new_marker (framepos_t where, bool is_cd, bool is_xrun)
        }
 }
 
+void
+Editor::mouse_add_new_range (framepos_t where)
+{
+       if (!_session) {
+               return;
+       }
+
+       /* Make this marker 1/8th of the visible area of the session so that
+          it's reasonably easy to manipulate after creation.
+       */
+
+       framepos_t const end = where + current_page_frames() / 8;
+
+       string name;
+       _session->locations()->next_available_name (name, _("range"));
+       Location* loc = new Location (*_session, where, end, name, Location::IsRangeMarker);
+
+       begin_reversible_command (_("new range marker"));
+       XMLNode& before = _session->locations()->get_state ();
+       _session->locations()->add (loc, true);
+       XMLNode& after = _session->locations()->get_state ();
+       _session->add_command (new MementoCommand<Locations> (*_session->locations(), &before, &after));
+       commit_reversible_command ();
+}
+
 void
 Editor::remove_marker (ArdourCanvas::Item& item, GdkEvent*)
 {
@@ -869,14 +893,13 @@ Editor::build_range_marker_menu (bool loop_or_punch, bool session)
        markerMenu->set_name ("ArdourContextMenu");
 
        items.push_back (MenuElem (_("Play Range"), sigc::mem_fun(*this, &Editor::marker_menu_play_range)));
-       items.push_back (MenuElem (_("Locate to Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
-       items.push_back (MenuElem (_("Play from Range Mark"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
-       if (!loop_or_punch_or_session) {
-               items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
-       }
-       items.push_back (MenuElem (_("Set Range Mark from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
+       items.push_back (MenuElem (_("Locate to Marker"), sigc::mem_fun(*this, &Editor::marker_menu_set_playhead)));
+       items.push_back (MenuElem (_("Play from Marker"), sigc::mem_fun(*this, &Editor::marker_menu_play_from)));
+       items.push_back (MenuElem (_("Loop Range"), sigc::mem_fun(*this, &Editor::marker_menu_loop_range)));
+
+       items.push_back (MenuElem (_("Set Marker from Playhead"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_playhead)));
        if (!Profile->get_sae()) {
-               items.push_back (MenuElem (_("Set Range from Range Selection"), sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection)));
+               items.push_back (MenuElem (_("Set Range from Selection"), sigc::bind (sigc::mem_fun(*this, &Editor::marker_menu_set_from_selection), false)));
        }
 
        items.push_back (MenuElem (_("Zoom to Range"), sigc::mem_fun (*this, &Editor::marker_menu_zoom_to_range)));
@@ -894,7 +917,7 @@ Editor::build_range_marker_menu (bool loop_or_punch, bool session)
                items.push_back (MenuElem (_("Remove Range"), sigc::mem_fun(*this, &Editor::marker_menu_remove)));
        }
 
-       if (loop_or_punch_or_session) {
+       if (!loop_or_punch_or_session || !session) {
                items.push_back (SeparatorElem());
        }
        
@@ -1129,7 +1152,7 @@ Editor::marker_menu_set_from_playhead ()
 }
 
 void
-Editor::marker_menu_set_from_selection ()
+Editor::marker_menu_set_from_selection (bool /*force_regions*/)
 {
        Marker* marker;
 
@@ -1144,23 +1167,15 @@ Editor::marker_menu_set_from_selection ()
        if ((l = find_location_from_marker (marker, is_start)) != 0) {
 
                if (l->is_mark()) {
-                       // nothing for now
-               }
-               else {
 
-                       /* if range selection use first to last */
+                       // nothing for now
 
-                       if (mouse_mode == Editing::MouseRange) {
-                               if (!selection->time.empty()) {
-                                       l->set_start (selection->time.start());
-                                       l->set_end (selection->time.end_frame());
-                               }
-                       }
-                       else {
-                               if (!selection->regions.empty()) {
-                                       l->set_start (selection->regions.start());
-                                       l->set_end (selection->regions.end_frame());
-                               }
+               } else {
+                       
+                       if (!selection->time.empty()) {
+                               l->set (selection->time.start(), selection->time.end_frame());
+                       } else if (!selection->regions.empty()) {
+                               l->set (selection->regions.start(), selection->regions.end_frame());
                        }
                }
        }