Changeset 258:0bbabe034524 in roaraudio

Timestamp:

07/24/08 15:55:02 (16 years ago)

Author:

phi

Branch:

default

Phase:

public

Message:

globalized main_loop()'s pos to g_pos

File:

• roard/loop.c (modified) (4 diffs)

roard/loop.c

@@ -5 +5 @@
 int main_loop (int driver, DRIVER_USERDATA_T driver_inst, struct roar_audio_info * sa) {
  void ** streams_input = NULL;
- uint32_t pos = 0;
 #ifdef MONITOR_LATENCY
  struct timeval         try, ans;
@@ -17 +16 @@
  ROAR_DBG("main_loop(*) = ?");
  alive = 1;
+ g_pos = 0;
 
  while (alive) {
@@ -37 +37 @@
   if ( g_standby ) {
    // while in standby we still neet to get the buffers to free input buffer space.
-   streams_get_mixbuffers(&streams_input, sa, pos);
+   streams_get_mixbuffers(&streams_input, sa, g_pos);
   } else {
-   if ( streams_get_mixbuffers(&streams_input, sa, pos) == 0 ) {
+   if ( streams_get_mixbuffers(&streams_input, sa, g_pos) == 0 ) {
     mix_clients(g_output_buffer, sa->bits, streams_input, ROAR_OUTPUT_BUFFER_SAMPLES * sa->channels);
    }
@@ -53 +53 @@
    printf("usleep(%u) = ?\n", (1000000 * ROAR_OUTPUT_BUFFER_SAMPLES) / sa->rate);
   } else {
-   clients_send_filter(sa, pos);
+   clients_send_filter(sa, g_pos);
    output_buffer_flush(driver_inst, driver);
-   clients_send_mon(sa, pos);
+   clients_send_mon(sa, g_pos);
   }
 
-  midi_cb_update(pos);
+  midi_cb_update();
 //  output_buffer_reinit();
 
-  pos = ROAR_MATH_OVERFLOW_ADD(pos, ROAR_OUTPUT_BUFFER_SAMPLES);
+  g_pos = ROAR_MATH_OVERFLOW_ADD(g_pos, ROAR_OUTPUT_BUFFER_SAMPLES);
   ROAR_DBG("main_loop(*): current pos: %u", pos);
 #ifdef MONITOR_LATENCY