Changeset 5712:1548b8b21bd4 in roaraudio

Timestamp:

10/25/12 16:20:26 (11 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

moved to scheduler API

File:

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

roarclients/roarpluginrunner.c

@@ -35 +35 @@
 };
 
-static struct roar_dl_librarypara * g_para = NULL;
+static struct roar_dl_librarypara * g_para  = NULL;
+static struct roar_scheduler      * g_sched = NULL;
+static struct roar_scheduler_source g_s_service   = {.type = ROAR_SCHEDULER_CPI_SERVICE};
 
 static void usage (const char * progname) {
@@ -56 +58 @@
 
 static int do_run(const char * name) {
+ struct roar_scheduler_source s_container;
  struct roar_plugincontainer * cont = roar_plugincontainer_new(g_para);
  int err;
@@ -61 +64 @@
  if ( cont == NULL )
   return -1;
+
+ memset(&s_container, 0, sizeof(s_container));
+ s_container.type = ROAR_SCHEDULER_PLUGINCONTAINER;
+ s_container.handle.container = cont;
+ roar_scheduler_source_add(g_sched, &s_container);
 
  if ( roar_plugincontainer_load(cont, name, NULL) == -1 ) {
@@ -71 +79 @@
  roar_plugincontainer_appsched_trigger(cont, ROAR_DL_APPSCHED_INIT);
 
+/*
  while (roar_plugincontainer_appsched_trigger(cont, ROAR_DL_APPSCHED_WAIT) == 0)
   roar_plugincontainer_appsched_trigger(cont, ROAR_DL_APPSCHED_UPDATE);
+*/
+ roar_scheduler_run(g_sched);
 
  roar_plugincontainer_appsched_trigger(cont, ROAR_DL_APPSCHED_UPDATE);
  roar_plugincontainer_appsched_trigger(cont, ROAR_DL_APPSCHED_FREE);
 
+ roar_scheduler_source_del(g_sched, &s_container);
  roar_plugincontainer_unref(cont);
  return 0;
@@ -422 +434 @@
  const char * k;
 
+ g_sched = roar_scheduler_new(ROAR_SCHEDULER_FLAG_NONE, ROAR_SCHEDULER_STRATEGY_DEFAULT);
+ if ( g_sched == NULL ) {
+  fprintf(stderr, "Error creating scheduler object: %s\n", roar_error2str(roar_error));
+  return 1;
+ }
+
+ roar_scheduler_source_add(g_sched, &g_s_service);
+
  for (i = 1; i < argc; i++) {
   k = argv[i];
@@ -427 +447 @@
   if ( !strcmp(k, "-h") || !strcmp(k, "--help") ) {
    usage(argv[0]);
+   roar_scheduler_unref(g_sched);
    return 0;
   } else if ( !strcmp(k, "--run") ) {
@@ -467 +488 @@
  _clear_para();
 
+ roar_scheduler_unref(g_sched);
  return ret;
 }