Now we callback to the application with a string.

rec · Dec 28, 2014 · d80051b · d80051b
1 parent 6284425
commit d80051b
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 15 deletions.
diff --git a/code/cpp/echomesh/util/EchomeshApplication.cpp b/code/cpp/echomesh/util/EchomeshApplication.cpp
@@ -5,7 +5,7 @@ namespace echomesh {
 
 namespace {
 
-VoidCaller CALLBACK;
+StringCaller CALLBACK;
 void* USER_DATA;
 
 CriticalSection LOCK;
@@ -21,7 +21,7 @@ class ApplicationBase : public juce::JUCEApplicationBase {
     virtual bool moreThanOneInstanceAllowed() { return false; }
     virtual void initialise(const String&) {
         if (CALLBACK and USER_DATA)
-            CALLBACK(USER_DATA);
+            CALLBACK(USER_DATA, "start");
     }
     virtual void shutdown() {}
     virtual void anotherInstanceStarted(const String&) {}
@@ -41,7 +41,7 @@ juce::JUCEApplicationBase* juce_CreateApplication() {
 
 }  // namespace
 
-void startApplication(VoidCaller cb, void* userData) {
+void startApplication(StringCaller cb, void* userData) {
     {
         ScopedLock l(LOCK);
         STARTED = true;
@@ -58,7 +58,4 @@ bool isStarted() {
     return STARTED;
 }
 
-string timestamp() { return __TIME__; }
-string datestamp() { return __DATE__; }
-
 }  // namespace echomesh
diff --git a/code/cpp/echomesh/util/EchomeshApplication.h b/code/cpp/echomesh/util/EchomeshApplication.h
@@ -4,7 +4,7 @@
 
 namespace echomesh {
 
-void startApplication(VoidCaller, void*);
+void startApplication(StringCaller, void*);
 bool isStarted();
 
 string timestamp();

diff --git a/code/cpp/echomesh/util/EchomeshApplication.pyx b/code/cpp/echomesh/util/EchomeshApplication.pyx
@@ -4,10 +4,8 @@ from libcpp cimport bool
 from libcpp.string cimport string
 
 cdef extern from "echomesh/util/EchomeshApplication.h" namespace "echomesh":
-    void startApplication(VoidCaller cb, void* user_data) nogil
+    void startApplication(StringCaller cb, void* user_data) nogil
     bool isStarted()
-    string timestamp()
-    string datestamp()
 
 cdef extern from "echomesh/util/Quit.h" namespace "echomesh":
     void quit() nogil
@@ -18,13 +16,10 @@ def start_application(f):
     else:
         callback = NULL
     with nogil:
-        startApplication(perform_callback, callback)
+        startApplication(perform_string_callback, callback)
 
 def stop_application():
     quit()
 
 def is_started():
     return isStarted()
-
-def build_timestamp():
-    return timestamp(), datestamp()
diff --git a/code/python/echomesh/Instance.py b/code/python/echomesh/Instance.py
@@ -44,7 +44,7 @@ def do_quit():
         self.score_master = ScoreMaster.ScoreMaster()
         self.peers = Peers.Peers(self)
         self.socket = PeerSocket.PeerSocket(self, self.peers)
-        self.callback = self.after_server_starts
+        # self.callback = self.after_server_starts
 
         self.display = Display.display(self.callback)
         self.keyboard_runnable = self.osc = None
@@ -97,6 +97,10 @@ def main(self):
         time.sleep(self.timeout)
         # Prevents crashes if you start and stop echomesh very fast.
 
+    def callback(self, data):
+        if data == 'start':
+            self.after_server_starts()
+
     def after_server_starts(self):
         if cechomesh.LOADED:
             run_after(self.run,