Changeset 5836:81ccac5ddc61 in roaraudio for roarclients/roarpluginrunner.c

Timestamp:

01/06/13 20:38:43 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

Added half of the support for AppSched? Triggers ABOUT, HELP and PREFERENCES. This includes support in roarpluginrunner

File:

• roarclients/roarpluginrunner.c (modified) (9 diffs)

roarclients/roarpluginrunner.c

@@ -35 +35 @@
 };
 
+#define OPTION_NONE        0x0000
+#define OPTION_TOUCH       0x0001
+#define OPTION_ABOUT       0x0100
+#define OPTION_HELP        0x0200
+#define OPTION_PREFERENCES 0x0400
+
 static struct roar_dl_librarypara * g_para  = NULL;
 static struct roar_scheduler      * g_sched = NULL;
@@ -56 +62 @@
         );
 
+ fprintf(stderr, "\nRunner Options:\n\n");
+ fprintf(stderr, "    --option-touch       - Do not keep the plugin running:"
+                 "                           Do a single UPDATE cycle.\n"
+                 "    --option-no-touch    - Disable touch option.\n"
+                 "    --option-about       - Show an about dialog after startup.\n"
+                 "    --option-no-about    - Disable about option.\n"
+                 "    --option-help        - Show onlion help after startup.\n"
+                 "    --option-no-help     - Disable help option.\n"
+                 "    --option-preferences - Show preferences dialog after startup.\n"
+                 "    --option-no-preferences\n"
+                 "                         - Disable preferences option.\n"
+        );
+
  fprintf(stderr, "\nCPI Options:\n\n");
  fprintf(stderr, " -t --tcp                - Use TCP listen socket\n"
@@ -69 +88 @@
 }
 
-static int do_run(const char * name) {
+static int do_run(const char * name, int options) {
  struct roar_scheduler_source s_container;
  struct roar_plugincontainer * cont = roar_plugincontainer_new(g_para);
@@ -92 +111 @@
  roar_plugincontainer_appsched_trigger(cont, ROAR_DL_APPSCHED_INIT);
 
- roar_scheduler_run(g_sched);
+ if ( options & OPTION_ABOUT ) {
+  if ( roar_plugincontainer_appsched_trigger(cont, ROAR_DL_APPSCHED_ABOUT) == -1 ) {
+   ROAR_WARN("Can not call ABOUT trigger: %s", roar_errorstring);
+  }
+ }
+
+ if ( options & OPTION_HELP ) {
+  if ( roar_plugincontainer_appsched_trigger(cont, ROAR_DL_APPSCHED_HELP) == -1 ) {
+   ROAR_WARN("Can not call HELP trigger: %s", roar_errorstring);
+  }
+ }
+
+ if ( options & OPTION_PREFERENCES ) {
+  if ( roar_plugincontainer_appsched_trigger(cont, ROAR_DL_APPSCHED_PREFERENCES) == -1 ) {
+   ROAR_WARN("Can not call PREFERENCES trigger: %s", roar_errorstring);
+  }
+ }
+
+
+ if ( !(options & OPTION_TOUCH) )
+  roar_scheduler_run(g_sched);
 
  roar_plugincontainer_appsched_trigger(cont, ROAR_DL_APPSCHED_UPDATE);
@@ -303 +342 @@
 }
 
-static int do_plugin(enum action action, const char * name) {
+static int do_plugin(enum action action, const char * name, int options) {
  switch (action) {
   case EXPLAIN:
@@ -310 +349 @@
   case RUN:
   case RUN_AS_APPLICATION:
-    return do_run(name);
+    return do_run(name, options);
    break;
   default:
@@ -558 +597 @@
  int cpi_touched = 0;
  const char * cpi_host = NULL;
+ int options = OPTION_NONE;
 
  g_sched = roar_scheduler_new(ROAR_SCHEDULER_FLAG_NONE, ROAR_SCHEDULER_STRATEGY_DEFAULT);
@@ -618 +658 @@
    }
 
+#define _option(name) \
+  } else if ( !strcasecmp(k, "--option-" #name) ) { \
+   options |= OPTION_ ## name; \
+  } else if ( !strcasecmp(k, "--option-no-" #name) ) { \
+   options |= OPTION_ ## name; \
+   options -= OPTION_ ## name;
+#define __fix_vim_syntax_highlight }
+  _option(TOUCH)
+  _option(ABOUT)
+  _option(HELP)
+  _option(PREFERENCES)
+
   } else if ( !strcmp(k, "--appname") ) {
    appname = argv[++i];
@@ -640 +692 @@
    } else {
     roar_err_set(ROAR_ERROR_NONE);
-    if ( do_plugin(action, k) == -1 ) {
+    if ( do_plugin(action, k, options) == -1 ) {
      fprintf(stderr, "Error loading plugin: %s\n",
                      roar_error != ROAR_ERROR_NONE ? roar_error2str(roar_error) : roar_dl_errstr(NULL));