ardour/ardour
ardour
/
ardour
13
1
Fork 0
Code Pull Requests Releases Activity

Fix install path problems (s/ardour2/ardour3). 

Fix finding of keybindings file when running from source tree (via ardev/ardbg).
Fix clashing keybindings for zoom stuff.
Add note tool keybinding and menu entry.


git-svn-id: svn://localhost/ardour2/branches/3.0@3099 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
David Robillard 2008-02-21 19:30:01 +00:00
parent 0d0bd81a75
commit 4d94305cc9
32 changed files with 39 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gtk2_ardour/SConscript
View File

@ -461,12 +461,12 @@ if env['NLS']:
# configuration files
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_dark_theme))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), ardour_light_theme))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ardour3_ui_default.conf'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour3_ui_default.conf'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour.menus'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ardour-sae.menus'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'ergonomic-us.bindings'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'mnemonic-us.bindings'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour2'), 'SAE-de.bindings'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'ergonomic-us.bindings'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'mnemonic-us.bindings'))
env.Alias('install', env.Install(os.path.join(config_prefix, 'ardour3'), 'SAE-de.bindings'))
# data files
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3'), 'splash.png'))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'pixmaps'), pixmap_files))

1
gtk2_ardour/ardour.menus
View File

@ -136,6 +136,7 @@
<menuitem action='set-mouse-mode-gain'/>
<menuitem action='set-mouse-mode-zoom'/>
<menuitem action='set-mouse-mode-timefx'/>
<menuitem action='set-mouse-mode-note'/>
<separator/>
<menuitem action='cycle-edit-point'/>
<menuitem action='cycle-edit-point-with-marker'/>

2
gtk2_ardour/ardour_ui_ed.cc
View File

@ -225,8 +225,6 @@ ARDOUR_UI::install_actions ()
act = ActionManager::register_action (common_actions, X_("RemoveLastCapture"), _("Remove Last Capture"), mem_fun(*this, &ARDOUR_UI::remove_last_capture));
ActionManager::session_sensitive_actions.push_back (act);
ActionManager::register_action (common_actions, X_("About"), _("About"), mem_fun(*this, &ARDOUR_UI::show_splash));
Glib::RefPtr<ActionGroup> transport_actions = ActionGroup::create (X_("Transport"));
/* do-nothing action for the "transport" menu bar item */

9
gtk2_ardour/keyboard.cc
View File

@ -405,7 +405,6 @@ Keyboard::setup_keybindings ()
{
using namespace ARDOUR_COMMAND_LINE;
std::string default_bindings = "mnemonic-us.bindings";
std::string path;
vector<string> strs;
binding_files.clear ();
@ -415,7 +414,7 @@ Keyboard::setup_keybindings ()
/* set up the per-user bindings path */
strs.push_back (Glib::get_home_dir());
strs.push_back (".ardour2");
strs.push_back (".ardour3");
strs.push_back ("ardour.bindings");
user_keybindings_path = Glib::build_filename (strs);
@ -484,9 +483,7 @@ Keyboard::setup_keybindings ()
SearchPath spath = ardour_search_path() + user_config_directory() + system_config_search_path();
find_file_in_search_path (spath, keybindings_path, keybindings_file);
if (path.empty()) {
if ( ! find_file_in_search_path (spath, keybindings_path, keybindings_file)) {
if (keybindings_path == default_bindings) {
error << _("Default keybindings not found - Ardour will be hard to use!") << endmsg;
@ -502,7 +499,7 @@ Keyboard::setup_keybindings ()
/* use it */
keybindings_path = path;
keybindings_path = keybindings_file.to_string();
break;
}

1
gtk2_ardour/midi_region_view.cc
View File

@ -152,6 +152,7 @@ MidiRegionView::canvas_event(GdkEvent* ev)
switch (ev->type) {
case GDK_KEY_PRESS:
cout << "KEY" << endl;
if (ev->key.keyval == GDK_Delete && !delete_mod) {
delete_mod = true;
original_mode = trackview.editor.current_midi_edit_mode();

5
gtk2_ardour/mnemonic-us.bindings.in
View File

@ -91,10 +91,11 @@
;; HOME ROW
(gtk_accel_path "<Actions>/Editor/zoom-to-region" "z")
(gtk_accel_path "<Actions>/Editor/zoom-to-region" "<%SECONDARY%>z")
(gtk_accel_path "<Actions>/Editor/undo" "<%PRIMARY%>z")
(gtk_accel_path "<Actions>/Editor/toggle-zoom" "<%TERTIARY%>z")
(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-zoom" "<%TERTIARY%>z")
(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-zoom" "z")
(gtk_accel_path "<Actions>/MouseMode/set-mouse-mode-note" "<%TERTIARY%>n")
(gtk_accel_path "<Actions>/Editor/editor-cut" "<%PRIMARY%>x")
(gtk_accel_path "<Actions>/Editor/editor-copy" "<%PRIMARY%>c")
(gtk_accel_path "<Actions>/Common/ToggleColorManager" "<%WINDOW%>c")

2
libs/appleutility/SConscript
View File

@ -17,6 +17,6 @@ appleutility.Append(LINKFLAGS='-framework CoreServices')
libappleutility = appleutility.SharedLibrary('appleutility', appleutility_files)
if appleutility['COREAUDIO']:
Default(libappleutility)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libappleutility))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libappleutility))
env.Alias('tarball', env.Distribute (env['DISTTREE'], ['SConscript'] + appleutility_files + glob.glob('*.h') ))

2
libs/ardour/SConscript
View File

@ -170,7 +170,7 @@ if ardour['LIBLO']:
ardour.Append(CCFLAGS="-D_REENTRANT -D_LARGEFILE_SOURCE -D_LARGEFILE64_SOURCE")
ardour.Append(CXXFLAGS="-DDATA_DIR=\\\"" + os.path.join (final_prefix, 'share') + "\\\"")
ardour.Append(CXXFLAGS="-DMODULE_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR']) + "\\\"")
ardour.Append(CXXFLAGS="-DVAMP_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR'], 'ardour2', 'vamp') + "\\\"")
ardour.Append(CXXFLAGS="-DVAMP_DIR=\\\"" + os.path.join (final_prefix, env['LIBDIR'], 'ardour3', 'vamp') + "\\\"")
ardour.Append(CXXFLAGS="-DCONFIG_DIR=\\\"" + final_config_prefix + "\\\"")
ardour.Append(CXXFLAGS="-DLOCALEDIR=\\\"" + os.path.join (final_prefix, 'share', 'locale') + "\\\"")

2
libs/cairomm/SConscript
View File

@ -17,7 +17,7 @@ libcairomm = cairomm.SharedLibrary('cairomm', cairomm_files)
Default([libcairomm])
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libcairomm))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libcairomm))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript',

2
libs/clearlooks/SConscript
View File

@ -33,7 +33,7 @@ usable_libclearlooks = clearlooks.Install ('engines', libclearlooks)
Default (usable_libclearlooks)
env.Alias('install',
env.Install(os.path.join(install_prefix,env['LIBDIR'], 'ardour2', 'engines'),
env.Install(os.path.join(install_prefix,env['LIBDIR'], 'ardour3', 'engines'),
libclearlooks))
env.Alias('tarball', env.Distribute (env['DISTTREE'],

2
libs/glibmm2/SConscript
View File

@ -28,7 +28,7 @@ else :
Default([glibmm2_config_h, libglibmm2])
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libglibmm2))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libglibmm2))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript',

2
libs/gtkmm2/atk/SConscript
View File

@ -13,7 +13,7 @@ atkmm.Merge([libraries['glibmm2'], libraries['gtk2'], libraries['sigc2'] ])
libatkmm = atkmm.SharedLibrary('atkmm', atkmm_files)
Default(libatkmm)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libatkmm))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libatkmm))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'atkmm.h'] +

2
libs/gtkmm2/gdk/SConscript
View File

@ -14,7 +14,7 @@ gdkmm2.Append(CXXFLAGS=["-Ilibs/gtkmm2/gtk", "-DGLIBMM_EXCEPTIONS_ENABLED"])
libgdkmm2 = gdkmm2.SharedLibrary('gdkmm2', gdkmm2_files)
Default(libgdkmm2)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgdkmm2))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libgdkmm2))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'gdkmmconfig.h', 'gdkmm.h'] +

2
libs/gtkmm2/gtk/SConscript
View File

@ -17,7 +17,7 @@ if gtkmm2['IS_OSX']:
libgtkmm2 = gtkmm2.SharedLibrary('gtkmm2', gtkmm2_files)
Default(libgtkmm2)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgtkmm2))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libgtkmm2))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'gtkmmconfig.h', 'gtkmm.h'] +

2
libs/gtkmm2/pango/SConscript
View File

@ -16,7 +16,7 @@ if pangomm['IS_OSX']:
libpangomm = pangomm.SharedLibrary('pangomm', pangomm_files)
Default(libpangomm)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libpangomm))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libpangomm))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'pangomm.h'] +

2
libs/gtkmm2ext/SConscript
View File

@ -84,7 +84,7 @@ Default(libgtkmm2ext)
if env['NLS']:
i18n (gtkmm2ext, gtkmm2ext_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgtkmm2ext))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libgtkmm2ext))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'i18n.h', 'gettext.h'] +

2
libs/libgnomecanvasmm/SConscript
View File

@ -24,7 +24,7 @@ if gnomecanvasmm['IS_OSX']:
libgnomecanvasmm = gnomecanvasmm.SharedLibrary('libgnomecanvasmm', gnomecanvasmm_files)
Default(libgnomecanvasmm)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libgnomecanvasmm))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libgnomecanvasmm))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'libgnomecanvasmmconfig.h', 'libgnomecanvasmm.h'] +

2
libs/libsndfile/SConscript
View File

@ -36,7 +36,7 @@ else:
Default([sndfile_h,libsndfile])
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libsndfile))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libsndfile))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'NEWS', 'README', 'AUTHORS', 'ChangeLog',

2
libs/midi++2/SConscript
View File

@ -59,7 +59,7 @@ libmidi2 = midi2.SharedLibrary('midi++', [ sources, sysdep_src ])
Default(libmidi2)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libmidi2))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libmidi2))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] + sources + sysdep_sources +

2
libs/pbd/SConscript
View File

@ -72,7 +72,7 @@ mount_env.Program('mountpoint', 'mountpoint.cc')
if env['NLS']:
i18n (pbd, pbd_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libpbd))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libpbd))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'i18n.h', 'gettext.h', 'pbd/abstract_ui.cc' ] +

2
libs/sigc++2/SConscript
View File

@ -20,7 +20,7 @@ else :
Default([sigc2_config_h,libsigc2])
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libsigc2))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libsigc2))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'NEWS', 'README', 'AUTHORS', 'ChangeLog',

2
libs/soundtouch/SConscript
View File

@ -23,7 +23,7 @@ libst = st.SharedLibrary('soundtouch', soundtouch_files)
Default(libst)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libst))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libst))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript'] + soundtouch_files + glob.glob('*.h')))

2
libs/surfaces/control_protocol/SConscript
View File

@ -50,7 +50,7 @@ Default(libardour_cp)
if env['NLS']:
i18n (cp, cp_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libardour_cp))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libardour_cp))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] +

2
libs/surfaces/frontier/tranzport/SConscript
View File

@ -48,7 +48,7 @@ if tranzport['TRANZPORT']:
Default(libardour_tranzport)
if env['NLS']:
i18n (tranzport, tranzport_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_tranzport))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_tranzport))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] +

2
libs/surfaces/generic_midi/SConscript
View File

@ -51,7 +51,7 @@ Default(libardour_genericmidi)
if env['NLS']:
i18n (genericmidi, genericmidi_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_genericmidi))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_genericmidi))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] +

2
libs/surfaces/mackie/SConscript
View File

@ -69,7 +69,7 @@ if mackie['SURFACES']:
Default(libardour_mackie)
if env['NLS']:
i18n (mackie, mackie_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2','surfaces'), libardour_mackie))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3','surfaces'), libardour_mackie))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] +

2
libs/surfaces/powermate/SConscript
View File

@ -50,7 +50,7 @@ if env['POWERMATE']:
if env['NLS']:
i18n (powermate, powermate_files, env)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_powermate))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_powermate))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] +

2
libs/surfaces/tranzport/SConscript
View File

@ -74,7 +74,7 @@ if tranzport['TRANZPORT']:
i18n (tranzport, tranzport_files, env)
# if env['HAVE_TRANZPORT_KERNEL_DRIVER']:
# tranzport.Merge([ libraries['usb'] ])
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'surfaces'), libardour_tranzport))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'surfaces'), libardour_tranzport))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] +

2
libs/vamp-plugins/SConscript
View File

@ -18,7 +18,7 @@ libvampplugins = vampplugs.SharedLibrary('ardourvampplugins', plugin_files)
Default(libvampplugins)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2', 'vamp'), libvampplugins))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3', 'vamp'), libvampplugins))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript' ] +

4
libs/vamp-sdk/SConscript
View File

@ -34,8 +34,8 @@ libvamphostsdk = vampsdk.SharedLibrary('vamphostsdk', vamphostsdk_files)
Default(libvampsdk)
Default(libvamphostsdk)
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libvampsdk))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), libvamphostsdk))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libvampsdk))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), libvamphostsdk))
env.Alias('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript', 'COPYING', 'README' ] +

2
templates/SConscript
View File

@ -14,5 +14,5 @@ for template in template_files:
Default(template_build)
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour2', 'templates'), files))
env.Alias('install', env.Install(os.path.join(install_prefix, 'share', 'ardour3', 'templates'), files))
env.Alias('tarball', env.Distribute (env['DISTTREE'], [ 'SConscript' ] + template_build))

2
vst/SConscript
View File

@ -74,7 +74,7 @@ if ardour_vst['VST']:
# the wine script - into the bin dir
env.Alias('install', env.Install(os.path.join(install_prefix, 'bin'), wine_executable))
# the win32 executable - into the lib dir since the wine script will look for it there
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour2'), 'ardour_vst.exe.so'))
env.Alias('install', env.Install(os.path.join(install_prefix, env['LIBDIR'], 'ardour3'), 'ardour_vst.exe.so'))
env.Alias ('tarball', env.Distribute (env['DISTTREE'],
[ 'SConscript',