Merge remote-tracking branch 'origin/develop'

Builds/MacOSX/MIDI2LR.xcodeproj/project.pbxproj

@@ -47,6 +47,7 @@
 		BE7E7EF06FF4053F4417663C = {isa = PBXBuildFile; fileRef = 788447911A56FA34C9F8468E; };
 		92A115CF461BA5CFDF750CA7 = {isa = PBXBuildFile; fileRef = CFE017FDA090DB4518F95826; };
 		02A7CE68913E06429425B72C = {isa = PBXBuildFile; fileRef = 596A515E74C727B658C08FBE; };
+		BDE4152EF99D34942A18B128 = {isa = PBXBuildFile; fileRef = 17EC4CDCF4664D03C47FC1AE; };
 		5B1E88868F714EDC30BD06A1 = {isa = PBXBuildFile; fileRef = 8B172E18F0E34AE94D47AC12; };
 		1CBFBED27592AE60502C81C3 = {isa = PBXBuildFile; fileRef = 5205E1551934B25B9956903B; };
 		71E4A94C6C0AA69DC27972DF = {isa = PBXBuildFile; fileRef = DEBD9FE98B3F63E8D660310D; };
@@ -75,6 +76,7 @@
 		11A085E103F4DB635F250B4F = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = "utf_impl.cpp"; path = "../../icu/source/common/utf_impl.cpp"; sourceTree = "SOURCE_ROOT"; };
 		12A5F5628D5F8A75606C954E = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = cstring.cpp; path = ../../icu/source/common/cstring.cpp; sourceTree = "SOURCE_ROOT"; };
 		143DA00B5265FB49526E86AB = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.objcpp; name = DebugInfo.mm; path = ../../Source/DebugInfo.mm; sourceTree = "SOURCE_ROOT"; };
+		17EC4CDCF4664D03C47FC1AE = {isa = PBXFileReference; lastKnownFileType = sourcecode.cpp.cpp; name = Misc.cpp; path = ../../Source/Misc.cpp; sourceTree = "SOURCE_ROOT"; };
 		1C376A7F89CA0BC18630F667 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MainComponent.h; path = ../../Source/MainComponent.h; sourceTree = "SOURCE_ROOT"; };
 		21006303504EA15B0A68D6C7 = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; name = MainWindow.h; path = ../../Source/MainWindow.h; sourceTree = "SOURCE_ROOT"; };
 		21C6B16D556E368BC28C907B = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreAudio.framework; path = System/Library/Frameworks/CoreAudio.framework; sourceTree = SDKROOT; };
@@ -205,6 +207,7 @@
 					E03CBAF954A7A416CC4C5EFB,
 					596A515E74C727B658C08FBE,
 					F4C90FF76D76F4C7A08E98AD,
+					17EC4CDCF4664D03C47FC1AE,
 					04B184211B8A075FD6F0CCA8,
 					8B172E18F0E34AE94D47AC12,
 					872F7D5733C0B0577CA8C02B,
@@ -450,6 +453,7 @@
 					BE7E7EF06FF4053F4417663C,
 					92A115CF461BA5CFDF750CA7,
 					02A7CE68913E06429425B72C,
+					BDE4152EF99D34942A18B128,
 					5B1E88868F714EDC30BD06A1,
 					1CBFBED27592AE60502C81C3,
 					71E4A94C6C0AA69DC27972DF,

Builds/VisualStudio2017/EnableUserDumps.txt

@@ -0,0 +1,11 @@
+To send crash reports to me from Windows, you need to enable User-Mode Dumps.
+
+You can enable them by double-clicking on the EnableUserDumps.reg file in this directory and allowing that to change your registry. If you do that, the dumps will be in your AppData\Local\CrashDumps directory. AppData is a hidden directory in your user directory.
+
+If you want to edit the registry yourself, follow the instructions at https://msdn.microsoft.com/en-us/library/windows/desktop/bb787181(v=vs.85).aspx.
+
+In either event, contact me at https://groups.google.com/forum/#!forum/midi2lr, tell me what version of MIDI2LR you got the dump from, and post the file somewhere (like a file-sharing service) where I can download it.
+
+Thank you for your help!
+
+Rory

Builds/VisualStudio2017/MIDI2LR_App.vcxproj

@@ -181,6 +181,7 @@
     <ClCompile Include="..\..\Source\MIDIProcessor.cpp"/>
     <ClCompile Include="..\..\Source\MIDISender.cpp"/>
     <ClCompile Include="..\..\Source\MidiUtilities.cpp"/>
+    <ClCompile Include="..\..\Source\Misc.cpp"/>
     <ClCompile Include="..\..\Source\NrpnMessage.cpp"/>
     <ClCompile Include="..\..\Source\ProfileManager.cpp"/>
     <ClCompile Include="..\..\Source\PWoptions.cpp"/>

Builds/VisualStudio2017/MIDI2LR_App.vcxproj.filters

@@ -328,6 +328,9 @@
     <ClCompile Include="..\..\Source\MidiUtilities.cpp">
       <Filter>MIDI2LR\Source</Filter>
     </ClCompile>
+    <ClCompile Include="..\..\Source\Misc.cpp">
+      <Filter>MIDI2LR\Source</Filter>
+    </ClCompile>
     <ClCompile Include="..\..\Source\NrpnMessage.cpp">
       <Filter>MIDI2LR\Source</Filter>
     </ClCompile>

DoxyGen/Midi2lr.Doxyfile

@@ -2223,7 +2223,7 @@ DIA_PATH               =
 # and usage relations if the target is undocumented or is not a class.
 # The default value is: YES.
 
-HIDE_UNDOC_RELATIONS   = YES
+HIDE_UNDOC_RELATIONS   = NO
 
 # If you set the HAVE_DOT tag to YES then doxygen will assume the dot tool is
 # available from the path. This tool is part of Graphviz (see:
@@ -2298,7 +2298,7 @@ GROUP_GRAPHS           = YES
 # The default value is: NO.
 # This tag requires that the tag HAVE_DOT is set to YES.
 
-UML_LOOK               = NO
+UML_LOOK               = YES
 
 # If the UML_LOOK tag is enabled, the fields and methods are shown inside the
 # class node. If there are many fields or methods and many nodes the graph may

Installer/MIDI2LR-debug.xml

@@ -179,11 +179,17 @@
                     <platforms>windows</platforms>
                     <distributionFileList>
                         <distributionFile>
-                            <origin>../Builds/VisualStudio2017/x64/Debug/App/MIDI2LR.exe</origin>
+                            <origin>../Builds/VisualStudio2017/EnableUserDumps.reg</origin>
+                        </distributionFile>
+                        <distributionFile>
+                            <origin>../Builds/VisualStudio2017/EnableUserDumps.txt</origin>
                         </distributionFile>
                         <distributionFile>
                             <origin>../rtmidi/midiprobe.exe</origin>
                         </distributionFile>
+                        <distributionFile>
+                            <origin>../Builds/VisualStudio2017/x64/Debug/App/MIDI2LR.exe</origin>
+                        </distributionFile>
                     </distributionFileList>
                 </folder>
                 <folder>

MIDI2LR.jucer

@@ -63,6 +63,7 @@
       <FILE id="Z5nYLY" name="MidiUtilities.cpp" compile="1" resource="0"
             file="Source/MidiUtilities.cpp"/>
       <FILE id="rID3Fo" name="MidiUtilities.h" compile="0" resource="0" file="Source/MidiUtilities.h"/>
+      <FILE id="gxafEg" name="Misc.cpp" compile="1" resource="0" file="Source/Misc.cpp"/>
       <FILE id="cl1k7L" name="Misc.h" compile="0" resource="0" file="Source/Misc.h"/>
       <FILE id="b8rH7o" name="NrpnMessage.cpp" compile="1" resource="0" file="Source/NrpnMessage.cpp"/>
       <FILE id="Vg4s1B" name="NrpnMessage.h" compile="0" resource="0" file="Source/NrpnMessage.h"/>

Source/CommandMap.cpp

@@ -23,6 +23,7 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #include <exception>
 #include "CommandMap.h"
 #include "LRCommands.h"
+#include "Misc.h"
 
 void CommandMap::AddCommandforMessage(size_t command, const rsj::MidiMessageId& message)
 {
@@ -32,16 +33,14 @@ void CommandMap::AddCommandforMessage(size_t command, const rsj::MidiMessageId&
       if (command < LrCommandList::LrStringList.size()) {
          auto cmd_abbreviation = LrCommandList::LrStringList.at(command);
          message_map_[message] = cmd_abbreviation;
-         command_string_map_.insert({cmd_abbreviation, message});
+         command_string_map_.emplace(cmd_abbreviation, message);
       }
       else
          message_map_[message] =
              LrCommandList::NextPrevProfile.at(command - LrCommandList::LrStringList.size());
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }
@@ -57,9 +56,7 @@ std::vector<const rsj::MidiMessageId*> CommandMap::GetMessagesForCommand(
       return mm;
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }
@@ -96,9 +93,7 @@ void CommandMap::ToXmlDocument(const juce::File& file) const
       }
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }

Source/CommandMenu.cpp

@@ -26,6 +26,7 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #include "CCoptions.h"
 #include "CommandMap.h"
 #include "LRCommands.h"
+#include "Misc.h"
 #include "PWoptions.h"
 
 CommandMenu::CommandMenu(const rsj::MidiMessageId& message) try : juce
@@ -47,9 +48,7 @@ CommandMenu::CommandMenu(const rsj::MidiMessageId& message) try : juce
    {
    }
 catch (const std::exception& e) {
-   juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-       juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-           + ProjectInfo::versionString);
+   rsj::ExceptionResponse(typeid(this).name(), __func__, e);
    throw;
 }
 
@@ -74,9 +73,7 @@ void CommandMenu::SetSelectedItem(size_t index)
              LrCommandList::NextPrevProfile.at(index - 1 - LrCommandList::LrStringList.size()));
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }
@@ -158,9 +155,7 @@ void CommandMenu::clicked(const juce::ModifierKeys& modifiers)
       }
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }

Source/CommandTable.cpp

@@ -24,6 +24,7 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #include <exception>
 #include <gsl/gsl_util>
 #include "CommandTableModel.h"
+#include "Misc.h"
 
 CommandTable::CommandTable(const juce::String& component_name, CommandTableModel* model) try : juce
    ::TableListBox{component_name, model}
@@ -37,9 +38,7 @@ CommandTable::CommandTable(const juce::String& component_name, CommandTableModel
               | juce::TableHeaderComponent::sortedForwards);
    }
 catch (const std::exception& e) {
-   juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-       juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-           + ProjectInfo::versionString);
+   rsj::ExceptionResponse(typeid(this).name(), __func__, e);
    throw;
 }
 
@@ -89,9 +88,7 @@ bool CommandTable::keyPressed(const KeyPress& k)
       return false;
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }

Source/CommandTableModel.cpp

@@ -26,6 +26,7 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #include "CommandMap.h"
 #include "CommandMenu.h"
 #include "LRCommands.h"
+#include "Misc.h"
 
 void CommandTableModel::Init(CommandMap* map_command) noexcept
 {
@@ -113,9 +114,7 @@ void CommandTableModel::paintCell(
       }
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }
@@ -173,9 +172,7 @@ juce::Component* CommandTableModel::refreshComponentForCell(int row_number, int
       return nullptr;
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }
@@ -191,9 +188,7 @@ void CommandTableModel::AddRow(int midi_channel, int midi_data, rsj::MsgIdEnum m
       }
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }
@@ -246,9 +241,7 @@ void CommandTableModel::BuildFromXml(const juce::XmlElement* root)
       Sort();
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }

Source/LR_IPC_In.cpp

@@ -29,6 +29,7 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #include "CommandMap.h"
 #include "ControlsModel.h"
 #include "MIDISender.h"
+#include "Misc.h"
 #include "MidiUtilities.h"
 #include "ProfileManager.h"
 #include "SendKeys.h"
@@ -78,9 +79,7 @@ void LrIpcIn::Init(std::shared_ptr<MidiSender> midi_sender)
       process_line_future_ = std::async(std::launch::async, &LrIpcIn::ProcessLine, this);
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }
@@ -159,9 +158,7 @@ void LrIpcIn::run()
       // thread_started_ = false; //don't change flag while depending upon it
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }
@@ -179,9 +176,7 @@ void LrIpcIn::timerCallback()
       }
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }
@@ -280,9 +275,7 @@ void LrIpcIn::ProcessLine()
       } while (true);
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }

Source/LR_IPC_Out.cpp

@@ -32,6 +32,7 @@ MIDI2LR.  If not, see <http://www.gnu.org/licenses/>.
 #include "MIDIProcessor.h"
 #include "MidiUtilities.h"
 #include "MIDISender.h"
+#include "Misc.h"
 using namespace std::string_literals;
 
 namespace {
@@ -74,9 +75,7 @@ void LrIpcOut::Init(std::shared_ptr<MidiSender> midi_sender, MidiProcessor* midi
          midi_processor->AddCallback(this, &LrIpcOut::MidiCmdCallback);
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }
@@ -138,9 +137,7 @@ void LrIpcOut::MidiCmdCallback(rsj::MidiMessage mm)
       }
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }
@@ -213,9 +210,7 @@ void LrIpcOut::SendOut()
       } while (true);
    }
    catch (const std::exception& e) {
-      juce::NativeMessageBox::showMessageBox(juce::AlertWindow::WarningIcon, "Error",
-          juce::String("Exception ") + e.what() + ' ' + __func__ + ' ' + __FILE__ + ". Version "
-              + ProjectInfo::versionString);
+      rsj::ExceptionResponse(typeid(this).name(), __func__, e);
       throw;
    }
 }