Changeset 982:05f1be351ac0 in roaraudio

Timestamp:

12/17/08 21:14:07 (15 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

quit if a primary output stream can not be inited, changed change of g_pos to be the same as for streams

Location:

roard

Files:

• loop.c (modified) (2 diffs)
• roard.c (modified) (5 diffs)

roard/loop.c

@@ -40 +40 @@
 
  ROAR_DBG("main_loop(*) = ?");
- alive = 1;
+// alive = 1;
  g_pos = 0;
 
@@ -94 +94 @@
 //  output_buffer_reinit();
 
-  g_pos = ROAR_MATH_OVERFLOW_ADD(g_pos, ROAR_OUTPUT_BUFFER_SAMPLES);
+  g_pos = ROAR_MATH_OVERFLOW_ADD(g_pos, ROAR_OUTPUT_BUFFER_SAMPLES*g_sa->channels);
   ROAR_DBG("main_loop(*): current pos: %u", g_pos);
 #ifdef MONITOR_LATENCY

roard/roard.c

@@ -135 +135 @@
  if ( (stream = streams_new()) == -1 ) {
   ROAR_DBG("add_output(drv='%s', dev='%s', opts='%s') = -1", drv, dev, opts);
+  if ( prim ) alive = 0;
   return -1;
  }
@@ -168 +169 @@
     ROAR_ERR("add_output(*): unknown codec '%s'", v);
     streams_delete(stream);
+    if ( prim ) alive = 0;
     return -1;
    }
@@ -173 +175 @@
    ROAR_ERR("add_output(*): unknown option '%s'", k);
    streams_delete(stream);
+   if ( prim ) alive = 0;
    return -1;
   }
@@ -188 +191 @@
   streams_delete(stream);
   ROAR_DBG("add_output(drv='%s', dev='%s', opts='%s') = -1", drv, dev, opts);
+  if ( prim ) alive = 0;
   return -1;
  }
@@ -240 +244 @@
  g_standby       =  0;
  g_autostandby   =  0;
+ alive           =  1;
 
  sa.bits     = ROAR_BITS_DEFAULT;