Tracks calls tracks "Tracks"; Ardour uses type-names

diff --git a/libs/ardour/ardour/session.h b/libs/ardour/ardour/session.h
index b48b326a6077681db487d70664b19aa82dc948ec..c90c83cca86d181433ca00fcee49e7ef87018797 100644 (file)
--- a/libs/ardour/ardour/session.h
+++ b/libs/ardour/ardour/session.h
@@ -148,6 +148,9 @@ class LIBARDOUR_API Session : public PBD::StatefulDestructible, public PBD::Scop
                Recording = 2
        };
 
+    static const char * default_trx_track_name_pattern;
+    static const char * default_ardour_track_name_pattern;
+    
        /* a new session might have non-empty mix_template, an existing session should always have an empty one.
           the bus profile can be null if no master out bus is required.
        */

diff --git a/libs/ardour/session.cc b/libs/ardour/session.cc
index 1afec8a89e937db0a5a22e073f971be9d27bc04c..f4ff57222d6a30d6421c12c2abc08b02588953b5 100644 (file)
--- a/libs/ardour/session.cc
+++ b/libs/ardour/session.cc
@@ -113,6 +113,9 @@ using namespace std;
 using namespace ARDOUR;
 using namespace PBD;
 
+const char * Session::default_trx_track_name_pattern = "Track "; // add track number to the pattern
+const char * Session::default_ardour_track_name_pattern = "Audio "; // add track number to the pattern
+
 bool Session::_disable_all_loaded_plugins = false;
 
 PBD::Signal1<int,uint32_t> Session::AudioEngineSetupRequired;
@@ -2426,10 +2429,18 @@ Session::new_audio_track (int input_channels, int output_channels, TrackMode mod
        RouteList new_routes;
        list<boost::shared_ptr<AudioTrack> > ret;
 
-       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _("Audio");
-
+       string name_pattern("");
+       if (Profile->get_trx() ) {
+               name_pattern = default_trx_track_name_pattern;
+       } else {
+               name_pattern = default_ardour_track_name_pattern;
+       }
+    
+       bool const use_number = (how_many != 1) || name_template.empty () || name_template == _(name_pattern.c_str() );
+       
        while (how_many) {
-               if (!find_route_name (name_template.empty() ? _("Audio") : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
+
+               if (!find_route_name (name_template.empty() ? _(name_pattern.c_str() ) : name_template, ++track_id, track_name, sizeof(track_name), use_number)) {
                        error << "cannot find name for new audio track" << endmsg;
                        goto failed;
                }