From af5815e79bcd2a17edbdf5d45f1c7df02af546d8 Mon Sep 17 00:00:00 2001 From: Nick Mainsbridge Date: Tue, 4 Apr 2006 02:28:44 +0000 Subject: [PATCH] new region names are now based on file source names, standardise capitalisation of location right click menus git-svn-id: svn://localhost/trunk/ardour2@440 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/editor_markers.cc | 50 +++++++++++++++++------------------ libs/ardour/diskstream.cc | 2 +- libs/ardour/session.cc | 8 +++--- 3 files changed, 29 insertions(+), 31 deletions(-) diff --git a/gtk2_ardour/editor_markers.cc b/gtk2_ardour/editor_markers.cc index 1d9d1b56d1..bbeeeefec1 100644 --- a/gtk2_ardour/editor_markers.cc +++ b/gtk2_ardour/editor_markers.cc @@ -451,15 +451,15 @@ Editor::build_marker_menu () MenuList& items = marker_menu->items(); marker_menu->set_name ("ArdourContextMenu"); - items.push_back (MenuElem (_("Locate to mark"), mem_fun(*this, &Editor::marker_menu_set_playhead))); - items.push_back (MenuElem (_("Play from mark"), mem_fun(*this, &Editor::marker_menu_play_from))); - items.push_back (MenuElem (_("Set mark from playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead))); + items.push_back (MenuElem (_("Locate to Mark"), mem_fun(*this, &Editor::marker_menu_set_playhead))); + items.push_back (MenuElem (_("Play from Mark"), mem_fun(*this, &Editor::marker_menu_play_from))); + items.push_back (MenuElem (_("Set Mark from Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Rename mark"), mem_fun(*this, &Editor::marker_menu_rename))); - items.push_back (MenuElem (_("Hide mark"), mem_fun(*this, &Editor::marker_menu_hide))); - items.push_back (MenuElem (_("Remove mark"), mem_fun(*this, &Editor::marker_menu_remove))); + items.push_back (MenuElem (_("Rename Mark"), mem_fun(*this, &Editor::marker_menu_rename))); + items.push_back (MenuElem (_("Hide Mark"), mem_fun(*this, &Editor::marker_menu_hide))); + items.push_back (MenuElem (_("Remove Mark"), mem_fun(*this, &Editor::marker_menu_remove))); } @@ -472,22 +472,22 @@ Editor::build_range_marker_menu () MenuList& items = range_marker_menu->items(); range_marker_menu->set_name ("ArdourContextMenu"); - items.push_back (MenuElem (_("Locate to range mark"), mem_fun(*this, &Editor::marker_menu_set_playhead))); - items.push_back (MenuElem (_("Play from range mark"), mem_fun(*this, &Editor::marker_menu_play_from))); - items.push_back (MenuElem (_("Loop range"), mem_fun(*this, &Editor::marker_menu_loop_range))); - items.push_back (MenuElem (_("Set range mark from playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead))); - items.push_back (MenuElem (_("Set range from range selection"), mem_fun(*this, &Editor::marker_menu_set_from_selection))); + items.push_back (MenuElem (_("Locate to Range Mark"), mem_fun(*this, &Editor::marker_menu_set_playhead))); + items.push_back (MenuElem (_("Play from Range Mark"), mem_fun(*this, &Editor::marker_menu_play_from))); + items.push_back (MenuElem (_("Loop Range"), mem_fun(*this, &Editor::marker_menu_loop_range))); + items.push_back (MenuElem (_("Set Range Mark from Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead))); + items.push_back (MenuElem (_("Set Range from Range Selection"), mem_fun(*this, &Editor::marker_menu_set_from_selection))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Rename range"), mem_fun(*this, &Editor::marker_menu_rename))); - items.push_back (MenuElem (_("Hide range"), mem_fun(*this, &Editor::marker_menu_hide))); - items.push_back (MenuElem (_("Remove range"), mem_fun(*this, &Editor::marker_menu_remove))); + items.push_back (MenuElem (_("Rename Range"), mem_fun(*this, &Editor::marker_menu_rename))); + items.push_back (MenuElem (_("Hide Range"), mem_fun(*this, &Editor::marker_menu_hide))); + items.push_back (MenuElem (_("Remove Range"), mem_fun(*this, &Editor::marker_menu_remove))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Separate regions from range"), mem_fun(*this, &Editor::marker_menu_separate_regions_using_location))); - items.push_back (MenuElem (_("Select all in range"), mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range))); + items.push_back (MenuElem (_("Separate Regions in Range"), mem_fun(*this, &Editor::marker_menu_separate_regions_using_location))); + items.push_back (MenuElem (_("Select All in Range"), mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range))); } @@ -513,8 +513,8 @@ Editor::build_new_transport_marker_menu () MenuList& items = new_transport_marker_menu->items(); new_transport_marker_menu->set_name ("ArdourContextMenu"); - items.push_back (MenuElem (_("Set loop range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_loop))); - items.push_back (MenuElem (_("Set punch range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_punch))); + items.push_back (MenuElem (_("Set Loop Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_loop))); + items.push_back (MenuElem (_("Set Punch Range"), mem_fun(*this, &Editor::new_transport_marker_menu_set_punch))); new_transport_marker_menu->signal_unmap_event().connect ( mem_fun(*this, &Editor::new_transport_marker_menu_popdown)); } @@ -528,15 +528,15 @@ Editor::build_transport_marker_menu () MenuList& items = transport_marker_menu->items(); transport_marker_menu->set_name ("ArdourContextMenu"); - items.push_back (MenuElem (_("Locate to range mark"), mem_fun(*this, &Editor::marker_menu_set_playhead))); - items.push_back (MenuElem (_("Play from range mark"), mem_fun(*this, &Editor::marker_menu_play_from))); - items.push_back (MenuElem (_("Set range mark from playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead))); - items.push_back (MenuElem (_("Set range mark from range"), mem_fun(*this, &Editor::marker_menu_set_from_selection))); + items.push_back (MenuElem (_("Locate to Range Mark"), mem_fun(*this, &Editor::marker_menu_set_playhead))); + items.push_back (MenuElem (_("Play from Range Mark"), mem_fun(*this, &Editor::marker_menu_play_from))); + items.push_back (MenuElem (_("Set Range Mark from Playhead"), mem_fun(*this, &Editor::marker_menu_set_from_playhead))); + items.push_back (MenuElem (_("Set Range from Range Selection"), mem_fun(*this, &Editor::marker_menu_set_from_selection))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Hide range"), mem_fun(*this, &Editor::marker_menu_hide))); + items.push_back (MenuElem (_("Hide Range"), mem_fun(*this, &Editor::marker_menu_hide))); items.push_back (SeparatorElem()); - items.push_back (MenuElem (_("Separate regions from range"), mem_fun(*this, &Editor::marker_menu_separate_regions_using_location))); - items.push_back (MenuElem (_("Select all in Range"), mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range))); + items.push_back (MenuElem (_("Separate Regions in Range"), mem_fun(*this, &Editor::marker_menu_separate_regions_using_location))); + items.push_back (MenuElem (_("Select All in Range"), mem_fun(*this, &Editor::marker_menu_select_all_selectables_using_range))); } void diff --git a/libs/ardour/diskstream.cc b/libs/ardour/diskstream.cc index 5e1f8251c7..542ff29e9a 100644 --- a/libs/ardour/diskstream.cc +++ b/libs/ardour/diskstream.cc @@ -1807,7 +1807,7 @@ DiskStream::transport_stopped (struct tm& when, time_t twhen, bool abort_capture for (buffer_position = channels[0].write_source->last_capture_start_frame(), ci = capture_info.begin(); ci != capture_info.end(); ++ci) { string region_name; - _session.region_name (region_name, _name, false); + _session.region_name (region_name, channels[0].write_source->name(), false); // cerr << _name << ": based on ci of " << (*ci)->start << " for " << (*ci)->frames << " add a region\n"; diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc index 71270f5e35..5e9a196c9a 100644 --- a/libs/ardour/session.cc +++ b/libs/ardour/session.cc @@ -2345,15 +2345,14 @@ Session::region_name (string& result, string base, bool newlevel) const } else { string::size_type pos; - if ((pos = base.find_last_of ('-')) == string::npos) { - pos = base.find_last_of ('.'); - } + pos = base.find_last_of ('.'); /* pos may be npos, but then we just use entire base */ subbase = base.substr (0, pos); + } - + bool name_taken = true; { @@ -2385,7 +2384,6 @@ Session::region_name (string& result, string base, bool newlevel) const /*NOTREACHED*/ } } - return 0; }