change behaviour of equivalent regions selection with modifier key

.gitignore

@@ -34,6 +34,7 @@ depcomp
 core
 core.*
 vgcore.*
+.vscode
 cscope.files
 cscope.out
 tags
@@ -53,11 +54,12 @@ tags
 /gtk2_ardour/po/*.mo
 /gtk2_ardour/*.pot
 /libs/ardour/po/*.mo
-/libs/ardour/ardour3.pot
+/libs/ardour/ardour*.pot
 /libs/ardour/libardour.pot
 /libs/gtkmm2ext/po/*.mo
 /libs/gtkmm2ext/libgtkmm2ext.pot
 /gtk2_ardour/appdata/po/*.mo
+/gtk2_ardour/appdata/*.pot
 /gtk2_ardour/ardour.appdata.xml.in
 
 # /gtk2_ardour/
@@ -131,9 +133,15 @@ tags
 
 /MSVCMixbus3/MSVCMixbus3.vsprops
 /MSVCardour3/MSVCMixbus3.vsprops
+/MSVCvst_scan/vst_scan.rc
 /icons/win32/msvc_resources.rc
-/tools/osx_packaging/Ardour/*.app
 
+/tools/osx_packaging/Ardour/*.app
 /tools/doxy2json/doxy2json
+/tools/icons/icon
 
-/MSVCvst_scan/vst_scan.rc
+# local dev scripts
+/share/scripts/_-*.lua
+
+# misc custom files git should ignore
+/local

MSVCMixbus3/MSVCMixbus3.vsprops.in → MSVCMixbus3/MSVCMixbus5.vsprops.in

@@ -2,7 +2,7 @@
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="MSVCMixbus3"
+	Name="MSVCMixbus5"
 	>
 	<UserMacro
 		Name="GlibApiVersion"
@@ -130,6 +130,6 @@
 	/>
 	<UserMacro
 		Name="LibardourFolder"
-		Value="mixbus3"
+		Value="mixbus5"
 	/>
 </VisualStudioPropertySheet>

MSVCardour3/MSVCArdour3.vsprops.in → MSVCardour3/MSVCArdour5.vsprops.in

@@ -2,7 +2,7 @@
 <VisualStudioPropertySheet
 	ProjectType="Visual C++"
 	Version="8.00"
-	Name="MSVCMixbus3"
+	Name="MSVCMixbus5"
 	>
 	<UserMacro
 		Name="GlibApiVersion"
@@ -130,6 +130,6 @@
 	/>
 	<UserMacro
 		Name="LibardourFolder"
-		Value="ardour3"
+		Value="ardour5"
 	/>
 </VisualStudioPropertySheet>

MSVCvst_scan/resource

@@ -1,6 +1,6 @@
 //{{NO_DEPENDENCIES}}
 // Microsoft Visual C++ generated include file.
-// Used by vst_scan.rc
+// Used by vst_scan.rc and vst3_scan.rc
 //
 #define IDM_ABOUTBOX                    0x0010
 #define IDD_ABOUTBOX                    100

MSVCvst_scan/vst3_scan.rc.in

@@ -0,0 +1,101 @@
+// Microsoft Visual C++ generated resource script.
+//
+#include "resource."
+
+#define APSTUDIO_READONLY_SYMBOLS
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 2 resource.
+//
+#include "afxres.h"
+
+/////////////////////////////////////////////////////////////////////////////
+#undef APSTUDIO_READONLY_SYMBOLS
+
+/////////////////////////////////////////////////////////////////////////////
+// English (U.K.) resources
+
+#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENG)
+#ifdef _WIN32
+LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_UK
+#pragma code_page(1252)
+#endif //_WIN32
+
+/////////////////////////////////////////////////////////////////////////////
+//
+// Version
+//
+
+1 VERSIONINFO
+ FILEVERSION @MSVC_SCANNER_APP_MAJOR@,@MSVC_SCANNER_APP_MINOR@,@MSVC_SCANNER_APP_MICRO@,@MSVC_SCANNER_APP_INTERFACE_AGE@
+ PRODUCTVERSION @MSVC_SCANNER_APP_MAJOR@,@MSVC_SCANNER_APP_MINOR@,@MSVC_SCANNER_APP_MICRO@,@MSVC_SCANNER_APP_INTERFACE_AGE@
+ FILEFLAGSMASK 0x3fL
+#ifdef _DEBUG
+ FILEFLAGS 0x29L
+#else
+ FILEFLAGS 0x28L
+#endif
+ FILEOS 0x4L
+ FILETYPE 0x1L
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "080904b0"
+        BEGIN
+            VALUE "CompanyName", "Harrison Audio LLC"
+            VALUE "FileDescription", "VST3 Plugin Scanning Application"
+            VALUE "FileVersion", "@MSVC_SCANNER_APP_VERSION@.@MSVC_SCANNER_APP_INTERFACE_AGE@"
+            VALUE "InternalName", "vst3_scan@DLL_SUFFIX@"
+            VALUE "LegalCopyright", "Copyright Paul Davis and others � 1999-2014"
+            VALUE "LegalTrademarks", "Harrison and Mixbus are trademarks of Harrison Audio LLC"
+            VALUE "OriginalFilename", "ardour-vst3-scanner.exe"
+            VALUE "ProductName", "MSVCvst3_scan"
+            VALUE "ProductVersion", "@MSVC_SCANNER_APP_MAJOR@, @MSVC_SCANNER_APP_MINOR@, @MSVC_SCANNER_APP_MICRO@, @MSVC_SCANNER_APP_INTERFACE_AGE@"
+            VALUE "SpecialBuild", "Built for Microsoft Windows by John Emmas - (� 2014)"
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x809, 1200
+    END
+END
+
+
+#ifdef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// TEXTINCLUDE
+//
+
+1 TEXTINCLUDE 
+BEGIN
+    "resource.\0"
+END
+
+3 TEXTINCLUDE 
+BEGIN
+    "\r\0"
+END
+
+2 TEXTINCLUDE 
+BEGIN
+    "#include ""afxres.h""\r\0"
+END
+
+#endif    // APSTUDIO_INVOKED
+
+#endif    // English (U.K.) resources
+/////////////////////////////////////////////////////////////////////////////
+
+
+
+#ifndef APSTUDIO_INVOKED
+/////////////////////////////////////////////////////////////////////////////
+//
+// Generated from the TEXTINCLUDE 3 resource.
+//
+
+/////////////////////////////////////////////////////////////////////////////
+#endif    // not APSTUDIO_INVOKED
+

TRANSLATORS

@@ -57,6 +57,22 @@ to install them.
 7. Restart Ardour to see what your translation looks like and whether it needs 
 fixes, e.g. has to be shorter.
 
+8. IMPORTANT NOTE: there are times when the English phrase to be translated is
+ambiguous without more context. What does "S" mean? In such cases, we use a
+different markup for translated strings which includes context. It will appear
+in the msgid in the .po/.pot file like this:
+
+    CONTEXT|ToBeTranslated
+
+So for example
+
+    Solo|S
+
+This should help you understand the the "S" here is a short form designed to refer to "Solo".
+
+In your translated text, you should remove the CONTEXT and the | symbol. 
+
+
 Note that as of Ardour 4 the translations are only installed when you run 
 './waf i18n' after './waf' and before 'sudo ./waf install'.
 

ardour.1

@@ -1,75 +1,65 @@
-.TH ARDOUR 1 2002-12-29
+.\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.47.8.
+.TH ARDOUR "1" "July 2020" "ardour 6" "User Commands"
 .SH NAME
-ardour \- a digital audio workstation
+Ardour \- digital audio workstation
 .SH SYNOPSIS
-ardour
-.B \-b
-.RB [ \-U
-.IR file ]
-.RI [ session ]
-.br
-ardour
-.B \-\-help
+.B ardour
+[ \fI\,OPTIONS \/\fR] [ \fI\,SESSION-NAME \/\fR]
 .SH DESCRIPTION
-Ardour is a multichannel hard disk recorder (HDR) and digital audio 
-workstation (DAW).
-It is capable of simultaneous recording 24 or more channels of 32 bit audio at
-48kHz.
-Ardour is intended to function as a "professional" HDR system, replacing
-dedicated hardware solutions such as the Mackie HDR, the Tascam 2424 and more
-traditional tape systems like the Alesis ADAT series.
-It is also intended to provide the same or better functionality as software 
-systems such as ProTools, Samplitude, Logic Audio, Nuendo and Cubase VST (we 
-acknowledge these and all other names as trademarks of their respective 
-owners).
-It supports MIDI Machine Control, and so can be controlled from any MMC
-controller, such as the Mackie Digital 8 Bus mixer and many other modern
-digital mixers. 
+Ardour is a multichannel hard disk recorder (HDR) and digital audio workstation (DAW).
 .SH OPTIONS
 .TP
-.B \-a
-do not contact ardour.org at program startup to check for announcements
-.TP
-.B \-b
-Print all possible keyboard binding names.
-.TP
-.B \-U
-Specify the path to the GTK RC file to use.
-The provided one is called
-.B ardour_ui.rc
-and lives in the top level Ardour source directory.
-This file controls all color and font use within Ardour.
-Ardour will run without it, but its appearance is, uhm, ugly.
-.TP
-.B \-\-help
-Displays the help message.
-.SH FILES
-.TP
-.B ardour.rc
-Defaults and startup settings for Ardour.
-.TP
-.B ardour_ui.rc
-Definitions for the Ardour interface.
-.SH ENVIRONMENT
-.TP
-.B ARDOUR_RC
-Path to ardour.rc.
-.TP
-.B ARDOUR_SYSTEM_RC
-Path to the ardour_system.rc
-.TP
-.B LADSPA_PATH
-Path to LADSPA plugins.
-.SH BUGS
-Yes.
-http://tracker.ardour.org/ is the preferred bugtracker.
-.SH AUTHOR
-Paul Davis.
-Do
-.I not
-contact him directly.
-Instead,
-contact him at <[email protected]>.
-You can subscribe here:
+\fB\-a\fR, \fB\-\-no\-announcements\fR
+Do not contact website for announcements
+.TP
+\fB\-A\fR, \fB\-\-actions\fR
+Print all possible menu action names
+.TP
+\fB\-b\fR, \fB\-\-bindings\fR
+Display all current key bindings
+.TP
+\fB\-B\fR, \fB\-\-bypass\-plugins\fR
+Bypass all plugins in an existing session
+.TP
+\fB\-c\fR, \fB\-\-name\fR <name>
+Use a specific backend client name, default is ardour
+.TP
+\fB\-d\fR, \fB\-\-disable\-plugins\fR
+Disable all plugins (safe mode)
+.TP
+\fB\-D\fR, \fB\-\-debug\fR <options>
+Set debug flags. Use "\-D list" to see available options
+.TP
+\fB\-h\fR, \fB\-\-help\fR
+Print this message
+.TP
+\fB\-k\fR, \fB\-\-keybindings\fR <file>
+Path to the key bindings file to load
+.TP
+\fB\-m\fR, \fB\-\-menus\fR file
+Use "file" to define menus
+.TP
+\fB\-n\fR, \fB\-\-no\-splash\fR
+Do not show splash screen
+.TP
+\fB\-N\fR, \fB\-\-new\fR session\-name
+Create a new session from the command line
+.TP
+\fB\-O\fR, \fB\-\-no\-hw\-optimizations\fR
+Disable h/w specific optimizations
+.TP
+\fB\-P\fR, \fB\-\-no\-connect\-ports\fR
+Do not connect any ports at startup
+.TP
+\fB\-S\fR, \fB\-\-sync\fR
+Draw the GUI synchronously
+.TP
+\fB\-T\fR, \fB\-\-template\fR <name>
+Use given template for new session
+.TP
+\fB\-v\fR, \fB\-\-version\fR
+Print version and exit
+.SH "REPORTING BUGS"
+Report bugs to http://tracker.ardour.org
 .br
-http://lists.ardour.org/listinfo.cgi/ardour-dev-ardour.org
+Website http://ardour.org