Merge branch 'development' into eb-scopedpointer

Author: ethanbb

Source/Main.cpp

@@ -61,12 +61,15 @@ class OpenEphysApplication  : public JUCEApplication
 
         StringArray parameters;
         parameters.addTokens(commandLine," ","\"");
+        parameters.removeEmptyStrings();
 
 #ifdef WIN32
         //glWinInit();
 
-        if (parameters.contains("--console",true))
+        int consoleArg = parameters.indexOf("--console", true);
+        if (consoleArg != -1)
         {
+            parameters.remove(consoleArg);
             if (AllocConsole())
             {
                 freopen("CONOUT$","w",stdout);
@@ -81,14 +84,20 @@ class OpenEphysApplication  : public JUCEApplication
 
 #endif
 
-
         customLookAndFeel = new CustomLookAndFeel();
         LookAndFeel::setDefaultLookAndFeel(customLookAndFeel);
 
-        mainWindow = new MainWindow();
-
-
 
+        // signal chain to load
+        if (!parameters.isEmpty())
+        {
+            File fileToLoad(File::getCurrentWorkingDirectory().getChildFile(parameters[0]));
+            mainWindow = new MainWindow(fileToLoad);
+        }
+        else
+        {
+            mainWindow = new MainWindow();
+        }
     }
 
     void shutdown() { }

Source/MainWindow.cpp

@@ -39,7 +39,7 @@ static inline File getSavedStateDirectory() {
 #endif
 }
 
-	MainWindow::MainWindow()
+	MainWindow::MainWindow(const File& fileToLoad)
 : DocumentWindow(JUCEApplication::getInstance()->getApplicationName(),
 		Colour(Colours::black),
 		DocumentWindow::allButtons)
@@ -83,7 +83,11 @@ static inline File getSavedStateDirectory() {
 	// Constraining the window's size doesn't seem to work:
 	setResizeLimits(500, 500, 10000, 10000);
 
-	if (shouldReloadOnStartup)
+    if (!fileToLoad.getFullPathName().isEmpty())
+    {
+        ui->getEditorViewport()->loadState(fileToLoad);
+    }
+	else if (shouldReloadOnStartup)
 	{
 		File file = getSavedStateDirectory().getChildFile("lastConfig.xml");
 		ui->getEditorViewport()->loadState(file);

Source/MainWindow.h

@@ -46,7 +46,7 @@ class MainWindow   : public DocumentWindow
 
     /** Initializes the MainWindow, creates the AudioComponent, ProcessorGraph,
         and UIComponent, and sets the window boundaries. */
-    MainWindow();
+    MainWindow(const File& fileToLoad = File());
 
     /** Destroys the AudioComponent, ProcessorGraph, and UIComponent, and saves the window boundaries. */
     ~MainWindow();

Source/Plugins/EventBroadcaster/EventBroadcaster.cpp

@@ -11,25 +11,18 @@
 #include "EventBroadcaster.h"
 #include "EventBroadcasterEditor.h"
 
-EventBroadcaster::ZMQContext* EventBroadcaster::sharedContext = nullptr;
-CriticalSection EventBroadcaster::sharedContextLock{};
-
-EventBroadcaster::ZMQContext::ZMQContext(const ScopedLock& lock)
+EventBroadcaster::ZMQContext::ZMQContext()
 #ifdef ZEROMQ
     : context(zmq_ctx_new())
 #else
     : context(nullptr)
 #endif
-{
-    sharedContext = this;
-}
+{}
 
 // ZMQContext is a ReferenceCountedObject with a pointer in each instance's 
 // socket pointer, so this only happens when the last instance is destroyed.
 EventBroadcaster::ZMQContext::~ZMQContext()
 {
-    ScopedLock lock(sharedContextLock);
-    sharedContext = nullptr;
 #ifdef ZEROMQ
     zmq_ctx_destroy(context);
 #endif
@@ -49,18 +42,6 @@ EventBroadcaster::ZMQSocket::ZMQSocket()
     : socket    (nullptr)
     , boundPort (0)
 {
-    ScopedLock lock(sharedContextLock);
-    if (sharedContext == nullptr)
-    {
-        // first one, create the context
-        context = new ZMQContext(lock);
-    }
-    else
-    {
-        // use already-created context
-        context = sharedContext;
-    }
-
 #ifdef ZEROMQ
     socket = context->createZMQSocket();
 #endif
@@ -122,6 +103,7 @@ int EventBroadcaster::ZMQSocket::unbind()
         {
             boundPort = 0;
         }
+        return status;
     }
 #endif
     return 0;
@@ -157,7 +139,10 @@ AudioProcessorEditor* EventBroadcaster::createEditor()
 
 int EventBroadcaster::getListeningPort() const
 {
-    if (zmqSocket == nullptr) { return 0; }
+    if (zmqSocket == nullptr)
+    {
+        return 0;
+    }
     return zmqSocket->getBoundPort();
 }
 
@@ -197,7 +182,7 @@ int EventBroadcaster::setListeningPort(int port, bool forceRestart)
             }
         }
 
-        if (status != 0 && zmqSocket)
+        if (status != 0 && zmqSocket != nullptr)
         {
             // try to rebind current socket to previous port
             zmqSocket->bind(currPort);
@@ -208,7 +193,7 @@ int EventBroadcaster::setListeningPort(int port, bool forceRestart)
 
     // update editor
     auto editor = static_cast<EventBroadcasterEditor*>(getEditor());
-    if (editor)
+    if (editor != nullptr)
     {
         editor->setDisplayedPort(getListeningPort());
     }
@@ -229,7 +214,7 @@ void EventBroadcaster::sendEvent(const MidiMessage& event, float eventSampleRate
 	double timestampSeconds = double(Event::getTimestamp(event)) / eventSampleRate;
 	uint16 type = Event::getBaseType(event);
 
-    if (!zmqSocket)
+    if (zmqSocket == nullptr)
     {
         std::cout << "Failed to send message: no socket" << std::endl;
     }

Source/Plugins/EventBroadcaster/EventBroadcaster.h

@@ -42,11 +42,11 @@ class EventBroadcaster : public GenericProcessor
 
 
 private:
-    class ZMQContext : public ReferenceCountedObject
+    class ZMQContext
     {
     public:
-        ZMQContext(const ScopedLock& lock);
-        ~ZMQContext() override;
+        ZMQContext();
+        ~ZMQContext();
         void* createZMQSocket();
     private:
         void* context;
@@ -67,18 +67,15 @@ class EventBroadcaster : public GenericProcessor
     private:
         int boundPort;
         void* socket;
-        ReferenceCountedObjectPtr<ZMQContext> context;
+
+        // see here for why the context can't just be static:
+        // https://github.com/zeromq/libzmq/issues/1708
+        SharedResourcePointer<ZMQContext> context;
     };
 
 	void sendEvent(const MidiMessage& event, float eventSampleRate) const;
 
     static String getEndpoint(int port);
-
-    // share a "dumb" pointer that doesn't take part in reference counting.
-    // want the context to be terminated by the time the static members are
-    // destroyed (see: https://github.com/zeromq/libzmq/issues/1708)
-    static ZMQContext* sharedContext;
-    static CriticalSection sharedContextLock;
 
     ScopedPointer<ZMQSocket> zmqSocket;
 };

Source/Plugins/NetworkEvents/NetworkEvents.cpp

@@ -35,9 +35,6 @@ const int MAX_MESSAGE_LENGTH = 64000;
     #include <unistd.h>
 #endif
 
-NetworkEvents::ZMQContext* NetworkEvents::sharedContext = nullptr;
-CriticalSection NetworkEvents::sharedContextLock{};
-
 NetworkEvents::NetworkEvents()
     : GenericProcessor  ("Network Events")
     , Thread            ("NetworkThread")
@@ -79,6 +76,7 @@ String NetworkEvents::getCurrPortString() const
 
 void NetworkEvents::restartConnection()
 {
+    requestedPort = boundPort.load();
     makeNewSocket = true;
 }
 
@@ -430,21 +428,15 @@ String NetworkEvents::getPortString(uint16 port)
 
 /*** ZMQContext ***/
 
-NetworkEvents::ZMQContext::ZMQContext(const ScopedLock& lock)
+NetworkEvents::ZMQContext::ZMQContext()
 #ifdef ZEROMQ
     : context(zmq_ctx_new())
 #endif
-{
-    // sharedContextLock should already be held here
-    sharedContext = this;
-}
+{}
 
-// ZMQContext is a ReferenceCountedObject with a pointer in each instance's 
-// socket pointer, so this only happens when the last instance is destroyed.
+// only happens when the last SharedResourcePointer is destroyed.
 NetworkEvents::ZMQContext::~ZMQContext()
 {
-    ScopedLock lock(sharedContextLock);
-    sharedContext = nullptr;
 #ifdef ZEROMQ
     zmq_ctx_destroy(context);
 #endif
@@ -471,20 +463,6 @@ NetworkEvents::Responder::Responder(uint16 port)
     , boundPort (0)
     , lastErrno (0)
 {
-    {
-        ScopedLock lock(sharedContextLock);
-        if (sharedContext == nullptr)
-        {
-            // first one, create the context
-            context = new ZMQContext(lock);
-        }
-        else
-        {
-            // use already-created context
-            context = sharedContext;
-        }
-    }
-
 #ifdef ZEROMQ
     socket = context->createSocket();
     if (!socket)

Source/Plugins/NetworkEvents/NetworkEvents.h

@@ -90,15 +90,12 @@ class NetworkEvents : public GenericProcessor
         int64 timestamp;
     };
 
-    class ZMQContext : public ReferenceCountedObject
+    class ZMQContext
     {
     public:
-        ZMQContext(const ScopedLock& lock);
-        ~ZMQContext() override;
+        ZMQContext();
+        ~ZMQContext();
         void* createSocket();
-
-        typedef ReferenceCountedObjectPtr<ZMQContext> Ptr;
-
     private:
         void* context;
 
@@ -134,7 +131,7 @@ class NetworkEvents : public GenericProcessor
         int send(StringRef response);
 
     private:
-        ZMQContext::Ptr context;
+        SharedResourcePointer<ZMQContext> context;
         void* socket;
         bool valid;
         uint16 boundPort;
@@ -161,12 +158,6 @@ class NetworkEvents : public GenericProcessor
     // get a representation of the given port for use on the editor
     static String getPortString(uint16 port);
 
-    // share a "dumb" pointer that doesn't take part in reference counting.
-    // want the context to be terminated by the time the static members are
-    // destroyed (see: https://github.com/zeromq/libzmq/issues/1708)
-    static ZMQContext* sharedContext;
-    static CriticalSection sharedContextLock;
-
     std::atomic<bool> makeNewSocket;   // port change or restart needed (depending on requestedPort)
     std::atomic<uint16> requestedPort; // never set by the thread; 0 means any free port
     std::atomic<uint16> boundPort;     // only set by the thread; 0 means no connection