From 78af34fca86c6718efd478c3bd69da3c9cf87dc1 Mon Sep 17 00:00:00 2001 From: Paul Davis Date: Tue, 18 Dec 2007 22:48:07 +0000 Subject: [PATCH] restore old bindings; fixup ardour.menus; remove some compiler warnings; don't try to set NSD folder values when no command line argument is given git-svn-id: svn://localhost/ardour2/branches/2.0-ongoing@2795 d708f5d6-7413-0410-9779-e7cbd77b26cf --- gtk2_ardour/ardour.bindings.in | 53 +++++++++++++++------------------- gtk2_ardour/ardour.menus | 2 +- gtk2_ardour/ardour_ui.cc | 24 +++++++-------- libs/ardour/plugin_manager.cc | 2 +- 4 files changed, 38 insertions(+), 43 deletions(-) diff --git a/gtk2_ardour/ardour.bindings.in b/gtk2_ardour/ardour.bindings.in index 6191944392..82740c5fe3 100644 --- a/gtk2_ardour/ardour.bindings.in +++ b/gtk2_ardour/ardour.bindings.in @@ -1,4 +1,4 @@ -; ardour GtkAccelMap rc-file -*- scheme -*- +; ardour-2.0beta11.1 GtkAccelMap rc-file -*- scheme -*- ; this file is an automated accelerator map dump ; ; (gtk_accel_path "/RegionList/RegionListSort" "") @@ -10,10 +10,6 @@ ; (gtk_accel_path "/Editor/Autoconnect" "") ; (gtk_accel_path "/Editor/Edit" "") (gtk_accel_path "/Editor/playhead-to-previous-region-end" "<%PRIMARY%>comma") -(gtk_accel_path "/Editor/cycle-edit-point" "grave") -(gtk_accel_path "/Editor/toggle-edit-mode" "1") -(gtk_accel_path "/Editor/cycle-snap-mode" "2") -(gtk_accel_path "/Editor/cycle-snap-choice" "3") ; (gtk_accel_path "/redirectmenu/copy" "") ; (gtk_accel_path "/options/MeterFalloffFaster" "") (gtk_accel_path "/Transport/ToggleRollForgetCapture" "<%PRIMARY%>space") @@ -51,7 +47,7 @@ ; (gtk_accel_path "/Editor/Subframes" "") ; (gtk_accel_path "/Editor/Smpte2997drop" "") ; (gtk_accel_path "/Main/AddTrackBus" "") -(gtk_accel_path "/Editor/align-regions-end" "<%LEVEL4%>a") +(gtk_accel_path "/Editor/align-regions-end" "<%PRIMARY%><%LEVEL4%>a") ; (gtk_accel_path "/JACK/JACKDisconnect" "") ; (gtk_accel_path "/options/MeterFalloffFast" "") ; (gtk_accel_path "/options/FileDataFormatFloat" "") @@ -73,8 +69,6 @@ ; (gtk_accel_path "/options/StopPluginsWithTransport" "") (gtk_accel_path "/Editor/editor-paste" "<%PRIMARY%>v") (gtk_accel_path "/Editor/scroll-tracks-down" "Page_Down") -(gtk_accel_path "/Editor/select-next-route" "<%PRIMARY%>Page_Down") -(gtk_accel_path "/Editor/select-prev-route" "<%PRIMARY%>Page_Up") ; (gtk_accel_path "/Snap/snap-to-smpte-minutes" "") ; (gtk_accel_path "/Main/FlushWastebasket" "") (gtk_accel_path "/Editor/normalize-region" "n") @@ -116,7 +110,7 @@ ; (gtk_accel_path "/Editor/toggle-xfades-visible" "") (gtk_accel_path "/Editor/extend-range-to-end-of-region" "rightanglebracket") (gtk_accel_path "/Editor/scroll-backward" "leftarrow") -(gtk_accel_path "/Editor/start-range" "F1") +(gtk_accel_path "/Editor/start-range" "<%PRIMARY%>KP_Down") ; (gtk_accel_path "/ShuttleActions/SetShuttleUnitsSemitones" "") ; (gtk_accel_path "/JACK/JACKLatency128" "") ; (gtk_accel_path "/Snap/snap-to-beat" "") @@ -124,7 +118,7 @@ ; (gtk_accel_path "/Editor/snap-magnetic" "") ; (gtk_accel_path "/Editor/playhead-to-range-end" "") (gtk_accel_path "/Editor/scroll-playhead-forward" "<%TERTIARY%>rightarrow") -(gtk_accel_path "/Editor/align-regions-sync-relative" "y") +(gtk_accel_path "/Editor/align-regions-sync-relative" "a") ; (gtk_accel_path "/Editor/EditSelectRegionOptions" "") (gtk_accel_path "/Editor/crop" "c") ; (gtk_accel_path "/redirectmenu/newsend" "") @@ -133,11 +127,11 @@ ; (gtk_accel_path "/RegionList/rlRemove" "") (gtk_accel_path "/Transport/GotoStart" "Home") (gtk_accel_path "/Editor/scroll-playhead-backward" "<%TERTIARY%>leftarrow") -(gtk_accel_path "/Editor/split-region" "d") +(gtk_accel_path "/Editor/split-region" "s") ; (gtk_accel_path "/Transport/ToggleAutoInput" "") ; (gtk_accel_path "/Snap/snap-to-thirtyseconds" "") ; (gtk_accel_path "/Snap/snap-to-minutes" "") -(gtk_accel_path "/Editor/align-regions-sync" "a") +(gtk_accel_path "/Editor/align-regions-sync" "<%LEVEL4%>a") ; (gtk_accel_path "/Main/Windows" "") ; (gtk_accel_path "/Main/CleanupUnused" "") ; (gtk_accel_path "/redirectmenu/deselectall" "") @@ -149,12 +143,11 @@ ; (gtk_accel_path "/Snap/snap-to-region-boundary" "") ; (gtk_accel_path "/JACK/JACK" "") (gtk_accel_path "/Editor/editor-cut" "<%PRIMARY%>x") -(gtk_accel_path "/Editor/editor-separate" "F4") ; (gtk_accel_path "/RegionList/SortAscending" "") ; (gtk_accel_path "/Main/Help" "") ; (gtk_accel_path "/options/UseExternalMonitoring" "") ; (gtk_accel_path "/Editor/Smpte23976" "") -(gtk_accel_path "/Common/goto-editor" "<%SECONDARY%>e") +(gtk_accel_path "/Common/goto-editor" "<%WINDOW%>e") (gtk_accel_path "/Editor/select-all" "<%PRIMARY%>a") (gtk_accel_path "/Editor/nudge-next-forward" "<%PRIMARY%>KP_Add") ; (gtk_accel_path "/options/ShowSoloMutes" "") @@ -167,8 +160,7 @@ ; (gtk_accel_path "/Editor/PullupMinus4Minus1" "") (gtk_accel_path "/Editor/select-all-after-edit-cursor" "<%TERTIARY%><%PRIMARY%>e") ; (gtk_accel_path "/RegionList/SortBySourceFileName" "") -(gtk_accel_path "/Editor/finish-range" "F2") -(gtk_accel_path "/Editor/select-range-between-cursors" "F3") +(gtk_accel_path "/Editor/finish-range" "<%PRIMARY%>KP_Up") (gtk_accel_path "/Transport/Loop" "l") ; (gtk_accel_path "/Editor/CrossfadesFull" "") (gtk_accel_path "/Editor/finish-add-range" "<%TERTIARY%><%PRIMARY%>KP_Up") @@ -206,12 +198,12 @@ ; (gtk_accel_path "/Snap/snap-to-edit-cursor" "") (gtk_accel_path "/Editor/temporal-zoom-in" "minus") ; (gtk_accel_path "/JACK/Latency" "") -(gtk_accel_path "/Editor/edit-cursor-to-range-end" "<%TERTIARY%>F2") +(gtk_accel_path "/Editor/edit-cursor-to-range-end" "F2") ; (gtk_accel_path "/redirectmenu/rename" "") ; (gtk_accel_path "/RegionList/rlShowAuto" "") (gtk_accel_path "/Editor/select-all-before-playhead" "<%PRIMARY%>p") ; (gtk_accel_path "/Main/Session" "") -(gtk_accel_path "/Editor/edit-cursor-to-range-start" "<%TERTIARY%>F1") +(gtk_accel_path "/Editor/edit-cursor-to-range-start" "F1") ; (gtk_accel_path "/Main/AudioFileFormat" "") ; (gtk_accel_path "/Transport/Transport" "") (gtk_accel_path "/MouseMode/set-mouse-mode-timefx" "t") @@ -230,21 +222,20 @@ ; (gtk_accel_path "/Editor/Smpte24976" "") ; (gtk_accel_path "/options/FileDataFormat24bit" "") ; (gtk_accel_path "/Editor/SnapMode" "") -(gtk_accel_path "/Common/ToggleOptionsEditor" "<%PRIMARY%>o") +(gtk_accel_path "/Common/ToggleOptionsEditor" "<%WINDOW%>o") ; (gtk_accel_path "/Editor/PullupMinus4" "") -(gtk_accel_path "/Common/goto-mixer" "<%SECONDARY%>m") +(gtk_accel_path "/Common/goto-mixer" "<%WINDOW%>m") ; (gtk_accel_path "/RegionList/SortBySourceFileCreationDate" "") ; (gtk_accel_path "/redirectmenu/activate" "") (gtk_accel_path "/Editor/extend-range-to-start-of-region" "leftanglebracket") ; (gtk_accel_path "/Editor/PullupMinus1" "") ; (gtk_accel_path "/Editor/snap-normal" "") -(gtk_accel_path "/Common/ToggleBigClock" "<%SECONDARY%>b") -(gtk_accel_path "/Common/ToggleKeyEditor" "<%SECONDARY%>k") +(gtk_accel_path "/Common/ToggleBigClock" "<%WINDOW%>b") +(gtk_accel_path "/Common/ToggleKeyEditor" "<%WINDOW%>k") ; (gtk_accel_path "/Snap/snap-to-asixteenthbeat" "") (gtk_accel_path "/Editor/select-all-in-punch-range" "<%PRIMARY%>d") ; (gtk_accel_path "/redirectmenu/edit" "") -(gtk_accel_path "/Editor/duplicate-region" "p") -(gtk_accel_path "/Editor/multi-duplicate-region" "<%SECONDARY%>d") +(gtk_accel_path "/Editor/duplicate-region" "d") ; (gtk_accel_path "/JACK/JACKLatency2048" "") ; (gtk_accel_path "/Editor/ToggleWaveformsWhileRecording" "") ; (gtk_accel_path "/Zoom/zoom-focus-right" "") @@ -266,7 +257,7 @@ ; (gtk_accel_path "/Transport/ToggleVideoSync" "") (gtk_accel_path "/Transport/ToggleRoll" "space") ; (gtk_accel_path "/RegionList/SortBySourceFilesystem" "") -(gtk_accel_path "/Common/ToggleColorManager" "<%SECONDARY%>c") +(gtk_accel_path "/Common/ToggleColorManager" "<%WINDOW%>c") ; (gtk_accel_path "/Common/About" "") ; (gtk_accel_path "/JACK/JACKLatency32" "") (gtk_accel_path "/Editor/playhead-to-edit" "Return") @@ -287,9 +278,9 @@ (gtk_accel_path "/Editor/select-all-before-edit-cursor" "<%PRIMARY%>e") ; (gtk_accel_path "/Editor/Subframes80" "") ; (gtk_accel_path "/options/FileHeaderFormatCAF" "") -(gtk_accel_path "/Common/ToggleLocations" "<%SECONDARY%>l") +(gtk_accel_path "/Common/ToggleLocations" "<%WINDOW%>l") ; (gtk_accel_path "/Editor/ToggleGeneric MIDISurface" "") -(gtk_accel_path "/Editor/editor-delete" "BackSpace") +(gtk_accel_path "/Editor/editor-delete" "Delete") ; (gtk_accel_path "/JACK/JACKLatency256" "") (gtk_accel_path "/Editor/select-all-between-cursors" "u") ; (gtk_accel_path "/Editor/LayerAddHigher" "") @@ -320,12 +311,16 @@ ; (gtk_accel_path "/options/InputAutoConnectManual" "") ; (gtk_accel_path "/options/MeterHoldLong" "") ; (gtk_accel_path "/Snap/snap-to-seconds" "") +(gtk_accel_path "/Editor/cycle-edit-point" "grave") +(gtk_accel_path "/Editor/toggle-edit-mode" "1") +(gtk_accel_path "/Editor/cycle-snap-mode" "2") +(gtk_accel_path "/Editor/cycle-snap-choice" "3") (gtk_accel_path "/Editor/set-fade-in-length" "slash") (gtk_accel_path "/Editor/set-fade-out-length" "backslash") (gtk_accel_path "/Editor/trim-from-start" "<%TERTIARY%>braceleft") (gtk_accel_path "/Editor/trim-to-end" "<%TERTIARY%>braceright") -(gtk_accel_path "/Editor/trim-front" "a") -(gtk_accel_path "/Editor/trim-back" "s") +;(gtk_accel_path "/Editor/trim-front" "a") +;(gtk_accel_path "/Editor/trim-back" "s") (gtk_accel_path "/Editor/goto-mark-1" "KP_1") (gtk_accel_path "/Editor/goto-mark-2" "KP_2") (gtk_accel_path "/Editor/goto-mark-3" "KP_3") diff --git a/gtk2_ardour/ardour.menus b/gtk2_ardour/ardour.menus index 6bba78caaa..4681a4451c 100644 --- a/gtk2_ardour/ardour.menus +++ b/gtk2_ardour/ardour.menus @@ -109,7 +109,7 @@ - + diff --git a/gtk2_ardour/ardour_ui.cc b/gtk2_ardour/ardour_ui.cc index 5a932a53aa..d39dd96091 100644 --- a/gtk2_ardour/ardour_ui.cc +++ b/gtk2_ardour/ardour_ui.cc @@ -2018,24 +2018,24 @@ ARDOUR_UI::get_session_parameters (Glib::ustring predetermined_path, bool have_e int response = Gtk::RESPONSE_NONE; - Glib::ustring dir = Glib::path_get_dirname (string (predetermined_path)); - Glib::ustring name = basename_nosuffix (string (predetermined_path)); - - new_session_dialog->set_modal(true); - - if (name.length()) { - new_session_dialog->set_session_name (name); - } - if (dir.length()) { - new_session_dialog->set_session_folder (dir); + if (predetermined_path.length()) { + Glib::ustring dir = Glib::path_get_dirname (string (predetermined_path)); + Glib::ustring name = basename_nosuffix (string (predetermined_path)); + + new_session_dialog->set_modal(true); + + if (name.length()) { + new_session_dialog->set_session_name (name); + } + if (dir.length()) { + new_session_dialog->set_session_folder (dir); + } } new_session_dialog->reset_recent(); new_session_dialog->set_position (WIN_POS_CENTER); new_session_dialog->set_current_page (0); - cerr << "NSD with " << predetermined_path << endl; - do { new_session_dialog->set_have_engine (have_engine); diff --git a/libs/ardour/plugin_manager.cc b/libs/ardour/plugin_manager.cc index a884e92750..8c25bd12a7 100644 --- a/libs/ardour/plugin_manager.cc +++ b/libs/ardour/plugin_manager.cc @@ -283,7 +283,7 @@ PluginManager::ladspa_discover (string path) info->type = ARDOUR::LADSPA; char buf[32]; - snprintf (buf, sizeof (buf), "%u", descriptor->UniqueID); + snprintf (buf, sizeof (buf), "%lu", descriptor->UniqueID); info->unique_id = buf; for (uint32_t n=0; n < descriptor->PortCount; ++n) {