diff options
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/SConscript | 3 | ||||
| -rw-r--r-- | gtk2_ardour/about.cc | 3 | ||||
| -rw-r--r-- | gtk2_ardour/ardour.menus | 2 | ||||
| -rw-r--r-- | gtk2_ardour/audio_clock.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor_actions.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/editor_rulers.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/main.cc | 3 |
8 files changed, 11 insertions, 8 deletions
diff --git a/gtk2_ardour/SConscript b/gtk2_ardour/SConscript index a97bc234b8..fe98307c2d 100644 --- a/gtk2_ardour/SConscript +++ b/gtk2_ardour/SConscript @@ -19,6 +19,7 @@ gtkardour.Append(DOMAIN=domain, MAJOR=1,MINOR=0,MICRO=2) gtkardour.Append(CCFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") gtkardour.Append(CXXFLAGS="-DPACKAGE=\\\"" + domain + "\\\"") gtkardour.Append(CXXFLAGS="-DLIBSIGC_DISABLE_DEPRECATED") +gtkardour.Append(CPPPATH="#/") # for top level svn_revision.h #gtkardour.Append(CXXFLAGS="-DFLOWCANVAS_AA") gtkardour.Append(PACKAGE=domain) gtkardour.Append(POTFILE=domain + '.pot') @@ -305,7 +306,7 @@ env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2'), env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/pixmaps'), pixmap_files)) env.Alias('install', env.Install(os.path.join(install_prefix, 'share/ardour2/icons'), icon_files)) -env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], 'SConscript')) +env.Alias ('version', gtkardour.VersionBuild(['version.cc','version.h'], [])) #dist env.Alias ('tarball', env.Distribute (env['DISTTREE'], diff --git a/gtk2_ardour/about.cc b/gtk2_ardour/about.cc index 6710b2db52..959830725e 100644 --- a/gtk2_ardour/about.cc +++ b/gtk2_ardour/about.cc @@ -32,6 +32,7 @@ #include "utils.h" #include "version.h" +#include "svn_revision.h" #include "about.h" #include "rgb_macros.h" #include "ardour_ui.h" @@ -192,7 +193,7 @@ About::About () set_website_label (_("visit http://www.ardour.org/")); set_version ((string_compose(_("%1\n(built from revision %2)"), VERSIONSTRING, - gtk_ardour_revision))); + ardour_svn_revision))); #ifdef WITH_PAYMENT_OPTIONS diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus index f6c55edc62..bd172183e7 100644 --- a/gtk2_ardour/ardour.menus +++ b/gtk2_ardour/ardour.menus @@ -235,7 +235,7 @@ <menuitem action='FileHeaderFormatCAF'/> </menu> </menu> - <menu action='SMPTE'> + <menu action='Timecode'> <menuitem action='Smpte23976'/> <menuitem action='Smpte24'/> <menuitem action='Smpte24976'/> diff --git a/gtk2_ardour/audio_clock.cc b/gtk2_ardour/audio_clock.cc index 575f45ca38..4ec8c1b89f 100644 --- a/gtk2_ardour/audio_clock.cc +++ b/gtk2_ardour/audio_clock.cc @@ -1712,7 +1712,7 @@ AudioClock::build_ops_menu () MenuList& mode_items = mode_menu->items(); mode_menu->set_name ("ArdourContextMenu"); - mode_items.push_back (MenuElem (_("SMPTE"), bind (mem_fun(*this, &AudioClock::set_mode), SMPTE))); + mode_items.push_back (MenuElem (_("Timecode"), bind (mem_fun(*this, &AudioClock::set_mode), SMPTE))); mode_items.push_back (MenuElem (_("Bars:Beats"), bind (mem_fun(*this, &AudioClock::set_mode), BBT))); mode_items.push_back (MenuElem (_("Minutes:Seconds"), bind (mem_fun(*this, &AudioClock::set_mode), MinSec))); mode_items.push_back (MenuElem (_("Audio Frames"), bind (mem_fun(*this, &AudioClock::set_mode), Frames))); diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc index 0ba92ea54f..36f054912f 100644 --- a/gtk2_ardour/editor.cc +++ b/gtk2_ardour/editor.cc @@ -177,7 +177,7 @@ Editor::Editor (AudioEngine& eng) minsec_label (_("Mins:Secs")), bbt_label (_("Bars:Beats")), - smpte_label (_("SMPTE")), + smpte_label (_("Timecode")), frame_label (_("Frames")), tempo_label (_("Tempo")), meter_label (_("Meter")), diff --git a/gtk2_ardour/editor_actions.cc b/gtk2_ardour/editor_actions.cc index bf3b3b2cb5..3f0af44865 100644 --- a/gtk2_ardour/editor_actions.cc +++ b/gtk2_ardour/editor_actions.cc @@ -40,7 +40,7 @@ Editor::register_actions () ActionManager::register_action (editor_actions, X_("Monitoring"), _("Monitoring")); ActionManager::register_action (editor_actions, X_("Autoconnect"), _("Autoconnect")); ActionManager::register_action (editor_actions, X_("Layering"), _("Layering")); - ActionManager::register_action (editor_actions, X_("SMPTE"), _("SMPTE fps")); + ActionManager::register_action (editor_actions, X_("Timecode"), _("Timecode fps")); ActionManager::register_action (editor_actions, X_("Pullup"), _("Pullup / Pulldown")); ActionManager::register_action (editor_actions, X_("addExistingAudioFiles"), _("Add Existing Audio")); diff --git a/gtk2_ardour/editor_rulers.cc b/gtk2_ardour/editor_rulers.cc index 6f908a2c54..68db74adfb 100644 --- a/gtk2_ardour/editor_rulers.cc +++ b/gtk2_ardour/editor_rulers.cc @@ -371,7 +371,7 @@ Editor::popup_ruler_menu (nframes_t where, ItemType t) mitem->set_active(true); } - ruler_items.push_back (CheckMenuElem (X_("SMPTE"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_smpte))); + ruler_items.push_back (CheckMenuElem (X_("Timecode"), bind (mem_fun(*this, &Editor::ruler_toggled), (int)ruler_metric_smpte))); mitem = (CheckMenuItem *) &ruler_items.back(); if (ruler_shown[ruler_metric_smpte]) { mitem->set_active(true); diff --git a/gtk2_ardour/main.cc b/gtk2_ardour/main.cc index 6182182d38..adba03b83d 100644 --- a/gtk2_ardour/main.cc +++ b/gtk2_ardour/main.cc @@ -44,6 +44,7 @@ #include <gtkmm2ext/popup.h> #include <gtkmm2ext/utils.h> +#include "svn_revision.h" #include "version.h" #include "ardour_ui.h" #include "opts.h" @@ -384,7 +385,7 @@ int main (int argc, char *argv[]) cout << _("Ardour/GTK ") << VERSIONSTRING << _("\n (built using ") - << gtk_ardour_revision + << ardour_svn_revision #ifdef __GNUC__ << _(" and GCC version ") << __VERSION__ #endif |