From e5a5e1fe71b4308e471f4071582c7c119bac6688 Mon Sep 17 00:00:00 2001 From: VKamyshniy Date: Thu, 30 Oct 2014 21:30:15 +0200 Subject: [PATCH] [Summary] Switching the application name to Tracks Live --- gtk2_ardour/ardev.cmd | 4 +++- gtk2_ardour/ardour_ui.cc | 4 +--- gtk2_ardour/opts.cc | 2 +- gtk2_ardour/{tracks.menus.in => trackslive.menus.in} | 0 libs/ardour/directory_names.cc | 2 +- tools/dev_tools/windows/bar | 2 +- tools/dev_tools/windows/lar | 4 ++++ wscript | 6 +++--- 8 files changed, 14 insertions(+), 10 deletions(-) rename gtk2_ardour/{tracks.menus.in => trackslive.menus.in} (100%) diff --git a/gtk2_ardour/ardev.cmd b/gtk2_ardour/ardev.cmd index 07f31f4c0a..891226fec4 100755 --- a/gtk2_ardour/ardev.cmd +++ b/gtk2_ardour/ardev.cmd @@ -31,5 +31,7 @@ set GTK_PATH=%LIBS%\clearlooks-newer set VAMP_PATH=%LIBS%\vamp-plugins set PATH=%A3%\inst\bin;%GTK%\inst\bin;c:\mingw64win32\x86_64-w64-mingw32\bin;c:\mingw64win32\bin;%LIBS%\qm-dsp;%LIBS%\vamp-sdk;%LIBS%\surfaces;%LIBS%\surfaces\control_protocol;%LIBS%\ardour;%LIBS%\midi++2;%LIBS%\pbd;%LIBS%\rubberband;%LIBS%\soundtouch;%LIBS%\gtkmm2ext;%LIBS%\gnomecanvas;%LIBS%\libsndfile;%LIBS%\appleutility;%LIBS%\taglib;%LIBS%\evoral;%LIBS%\evoral\src\libsmf;%LIBS%\audiographer;%LIBS%\timecode;%LIBS%\libltc;%LIBS%\canvas;%PATH% -%AD%\tracks\build\gtk2_ardour\tracks.exe %1 +echo "------------------------------------------------------------------" +%AD%\tracks\build\gtk2_ardour\trackslive.exe %1 +echo "------------------------------------------------------------------" set path=%truelala% \ No newline at end of file diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 23424623db..5af40eff1a 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -17,8 +17,6 @@ */ -#include "product_definition.h" - #ifdef WAF_BUILD #include "gtk2ardour-config.h" #endif @@ -164,7 +162,7 @@ sigc::signal ARDOUR_UI::CloseAllDialogs; ARDOUR_UI::ARDOUR_UI (int *argcp, char **argvp[], const char* localedir) - : Gtkmm2ext::UI (APPLICATION_NAME, argcp, argvp) + : Gtkmm2ext::UI (PROGRAM_NAME, argcp, argvp) , gui_object_state (new GUIObjectState) , primary_clock (new MainClock (X_("primary"), false, X_("transport"), true, true, true, false, false)) , secondary_clock (new MainClock (X_("secondary"), false, X_("secondary"), true, true, false, false, true)) diff --git a/gtk2_ardour/opts.cc b/gtk2_ardour/opts.cc index 1630d11ca6..495c820624 100644 --- a/gtk2_ardour/opts.cc +++ b/gtk2_ardour/opts.cc @@ -43,7 +43,7 @@ char* ARDOUR_COMMAND_LINE::curvetest_file = 0; bool ARDOUR_COMMAND_LINE::try_hw_optimization = true; bool ARDOUR_COMMAND_LINE::no_connect_ports = false; string ARDOUR_COMMAND_LINE::keybindings_path = ""; /* empty means use builtin default */ -std::string ARDOUR_COMMAND_LINE::menus_file = "tracks.menus"; +std::string ARDOUR_COMMAND_LINE::menus_file = "trackslive.menus"; bool ARDOUR_COMMAND_LINE::finder_invoked_ardour = false; string ARDOUR_COMMAND_LINE::immediate_save; string ARDOUR_COMMAND_LINE::load_template; diff --git a/gtk2_ardour/tracks.menus.in b/gtk2_ardour/trackslive.menus.in similarity index 100% rename from gtk2_ardour/tracks.menus.in rename to gtk2_ardour/trackslive.menus.in diff --git a/libs/ardour/directory_names.cc b/libs/ardour/directory_names.cc index e97c688742..02cf0681a1 100644 --- a/libs/ardour/directory_names.cc +++ b/libs/ardour/directory_names.cc @@ -44,7 +44,7 @@ const char* const analysis_dir_name = X_("analysis"); const char* const plugins_dir_name = X_("plugins"); const char* const externals_dir_name = X_("externals"); -char config_dir_name[] = X_(PROGRAM_NAME); +char config_dir_name[] = X_("Tracks"); /* Use this to get a versioned config directory name char config_dir_name[] = X_(PROGRAM_NAME PROGRAM_VERSION); diff --git a/tools/dev_tools/windows/bar b/tools/dev_tools/windows/bar index b1af620b40..9b1fed1a44 100644 --- a/tools/dev_tools/windows/bar +++ b/tools/dev_tools/windows/bar @@ -8,6 +8,6 @@ export CPLUS_INCLUDE_PATH=$C_INCLUDE_PATH ./waf build -v else ./waf clean - if ./waf configure --program-name=Tracks --prefix="/" --bindir="/" --configdir="/share" --noconfirm --no-lv2 --dist-target=mingw ; then ./waf build -v; fi + if ./waf configure --program-name="Tracks Live" --prefix="/" --bindir="/" --configdir="/share" --noconfirm --no-lv2 --dist-target=mingw ; then ./waf build -v; fi fi ) 2>&1 | tee $AD/buildlog.txt #"$AD/ardour-build-log.`date +%Y-%m-%d--%H.%M`.txt" diff --git a/tools/dev_tools/windows/lar b/tools/dev_tools/windows/lar index 0284371157..df09e26b25 100644 --- a/tools/dev_tools/windows/lar +++ b/tools/dev_tools/windows/lar @@ -3,4 +3,8 @@ if [ "$ADWIN" == "" ] ; then exit 0 fi +echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" +echo ""/C $ADWIN\\Tracks\\gtk2_ardour\\ardev.cmd $*"" + cmd "/C $ADWIN\\Tracks\\gtk2_ardour\\ardev.cmd $*" 2>&1 | tee $AD/arlog.txt +echo "+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++" diff --git a/wscript b/wscript index 5a49f3a38b..369fc4bf07 100755 --- a/wscript +++ b/wscript @@ -48,7 +48,7 @@ V = MAJOR + '.' + MINOR + '.' + MICRO # because if it is, it breaks waf somehow. # VERSION = V.encode ('ascii', 'ignore') -APPNAME = 'Tracks' +APPNAME = 'Tracks Live' PROGRAM_VERSION = MAJOR.encode ('ascii', 'ignore') # Mandatory variables @@ -398,7 +398,7 @@ def set_compiler_flags (conf,opt): # plan to change this sooner rather than later # statefile_suffix = '.tracks' statefile_suffix = '.ardour' - executable_name = 'tracks' + executable_name = 'trackslive' conf.env['INSTALL_DIRNAME'] = lwrcase_dirname conf.env['EXECUTABLE_NAME'] = executable_name @@ -434,7 +434,7 @@ def options(opt): opt.load('compiler_c') opt.load('compiler_cxx') autowaf.set_options(opt, debug_by_default=True) - opt.add_option('--program-name', type='string', action='store', default='Tracks', dest='program_name', + opt.add_option('--program-name', type='string', action='store', default='Tracks Live', dest='program_name', help='The user-visible name of the program being built') opt.add_option('--arch', type='string', action='store', dest='arch', help='Architecture-specific compiler flags')