Changeset 7217c4f3d3ca45ca7950c5337d0f31e119484fed

Timestamp:

09/18/10 23:25:20 (3 years ago)

Author:

Nedko Arnaudov <nedko@…>

Children:

a9a55b0ddcb2223fc1ba0a5a47f357955bb1a42e

Parents:

4bad0a8038418a359af306aa505568561f0fc0ac

git-committer:

Nedko Arnaudov <nedko@arnaudov.name> / 2010-09-18T23:25:20Z+0300

Message:

daemon: proper notification on automatic studio creation. Fix for #88

Files:

• daemon/studio.c (modified) (3 diffs)

daemon/studio.c

@@ -109 +109 @@
 {
   ASSERT(!g_studio.announced);
-  ladish_notify_simple(LADISH_NOTIFY_URGENCY_NORMAL, "Studio loaded", NULL);
+
+  /* notify the user that studio started successfully, but dont lie when jack was started externally */
+  if (!g_studio.automatic)
+  {
+    ladish_notify_simple(LADISH_NOTIFY_URGENCY_NORMAL, "Studio loaded", NULL);
+  }
+
   g_studio.announced = true;
 }
@@ -350 +356 @@
 
   ladish_studio_emit_started();
-  ladish_notify_simple(LADISH_NOTIFY_URGENCY_NORMAL, "Studio started", NULL);
+
+  /* notify the user that studio started successfully, but dont lie when jack was started externally */
+  if (!g_studio.automatic)
+  {
+    ladish_notify_simple(LADISH_NOTIFY_URGENCY_NORMAL, "Studio started", NULL);
+  }
 }
 
@@ -429 +440 @@
 
       ladish_studio_on_event_jack_started();
+
+      if (g_studio.automatic)
+      {
+        ladish_notify_simple(
+          LADISH_NOTIFY_URGENCY_NORMAL,
+          "Automatic studio created",
+          "JACK server is started not by ladish daemon and there is no loaded studio, so a new studio is created and marked as started.");
+      }
     }
     else