Remove the preflight call - don't seem to need it.

diff --git a/audio.h b/audio.h
index 1767e41687640b03608715c15ea5c98fd7cd0323..a4f0f178e3357edb56bb8e74fb42ebdc35fe2fbe 100644 (file)
--- a/audio.h
+++ b/audio.h
@@ -22,8 +22,6 @@ typedef struct {
   void (*start)(int sample_rate, int sample_format);
 
   // block of samples
-  int (*preflight)(void *buf,
-                   int samples); // say you are about to send these samples (before interpolation)
   int (*play)(void *buf, int samples);
   void (*stop)(void);
 

diff --git a/audio_alsa.c b/audio_alsa.c
index e9ac05f915e5cd01b45a75142aa173f8015e849f..7fae429b4737c08ceeda39cabd5fcf65e36c7398 100644 (file)
--- a/audio_alsa.c
+++ b/audio_alsa.c
@@ -48,7 +48,6 @@ static int init(int argc, char **argv);
 static void deinit(void);
 static void start(int i_sample_rate, int i_sample_format);
 static int play(void *buf, int samples);
-int preflight(void *buf, int samples);
 static void stop(void);
 static void flush(void);
 int delay(long *the_delay);
@@ -1308,15 +1307,6 @@ static void flush(void) {
   pthread_cleanup_pop(0); // release the mutex
 }
 
-int preflight(__attribute__((unused)) void *buf, __attribute__((unused)) int samples) {
-  uint64_t time_now =
-      get_absolute_time_in_fp(); // this is to regulate access by the silence filler thread
-  uint64_t standoff_time = 60;   // milliseconds
-  standoff_time = (standoff_time << 32) / 1000;
-  most_recent_write_time = time_now + standoff_time;
-  return 0;
-}
-
 static void stop(void) {
   // debug(2,"audio_alsa stop called.");
   flush(); // flush will also close the device if appropriate

diff --git a/audio_ao.c b/audio_ao.c
index 30f80d8d509b2697bb9ff0949de9d957e1e41f89..42147bab96a59735e8ee833211bd151b000e2786 100644 (file)
--- a/audio_ao.c
+++ b/audio_ao.c
@@ -134,7 +134,6 @@ audio_output audio_ao = {.name = "ao",
                          .is_running = NULL,
                          .flush = NULL,
                          .delay = NULL,
-                         .preflight = NULL,
                          .play = &play,
                          .volume = NULL,
                          .parameters = NULL,

diff --git a/audio_dummy.c b/audio_dummy.c
index 69518cd03bc10821d7d413092a2324b9564e6244..d8dea87f2a0e16a6cdd2562052954095df23d812 100644 (file)
--- a/audio_dummy.c
+++ b/audio_dummy.c
@@ -65,7 +65,6 @@ audio_output audio_dummy = {.name = "dummy",
                             .is_running = NULL,
                             .flush = NULL,
                             .delay = NULL,
-                            .preflight = NULL,
                             .play = &play,
                             .volume = NULL,
                             .parameters = NULL,

diff --git a/audio_jack.c b/audio_jack.c
index 9a584385f849d279d0380392b8904e4c758affa7..c8a8b9ee2f4814683a36725b58f336b1cda44896 100644 (file)
--- a/audio_jack.c
+++ b/audio_jack.c
@@ -66,7 +66,6 @@ audio_output audio_jack = {.name = "jack",
                            .is_running = &jack_is_running,
                            .flush = &jack_flush,
                            .delay = &jack_delay,
-                           .preflight = NULL,
                            .play = &play,
                            .volume = NULL,
                            .parameters = NULL,
@@ -434,4 +433,4 @@ void jack_stop(void) {
   // debug(1, "jack stop");
   if (config.jack_auto_client_disconnect)
     jack_close();
-}
\ No newline at end of file
+}

diff --git a/audio_pa.c b/audio_pa.c
index 4ee20c7508d4ebdb7fc92db251743ce69ca4e2e7..cd321bd9f4d681023374f60f5b3110ff12d012bc 100644 (file)
--- a/audio_pa.c
+++ b/audio_pa.c
@@ -312,7 +312,6 @@ audio_output audio_pa = {.name = "pa",
                          .flush = &flush,
                          .delay = &pa_delay,
                          .play = &play,
-                         .preflight = NULL,
                          .volume = NULL,
                          .parameters = NULL,
                          .mute = NULL};

diff --git a/audio_pipe.c b/audio_pipe.c
index 0d4a42fd91ba81fe32f22041fac8f0e54404888e..89a09a0c656fb7c0c5c806b7d4a55d9dd7a9abd5 100644 (file)
--- a/audio_pipe.c
+++ b/audio_pipe.c
@@ -139,7 +139,6 @@ audio_output audio_pipe = {.name = "pipe",
                            .flush = NULL,
                            .delay = NULL,
                            .play = &play,
-                           .preflight = NULL,
                            .volume = NULL,
                            .parameters = NULL,
                            .mute = NULL};

diff --git a/audio_sndio.c b/audio_sndio.c
index e106b15d9aa03d54654004621457ce7e3a32c497..f22ed5af1430867d0a87826f40157adf3e526922 100644 (file)
--- a/audio_sndio.c
+++ b/audio_sndio.c
@@ -49,7 +49,6 @@ audio_output audio_sndio = {.name = "sndio",
                             .flush = &flush,
                             .delay = &delay,
                             .play = &play,
-                            .preflight = NULL,
                             .volume = NULL,
                             .parameters = NULL,
                             .mute = NULL};

diff --git a/audio_soundio.c b/audio_soundio.c
index 8942554d6f8a522aec1b31d1e2db47a31ba5c4d8..f57f99330963c1a92e6fd34b4548c8585d430d94 100644 (file)
--- a/audio_soundio.c
+++ b/audio_soundio.c
@@ -222,7 +222,6 @@ audio_output audio_soundio = {.name = "soundio",
                               .flush = &flush,
                               .delay = NULL,
                               .play = &play,
-                              .preflight = NULL,
                               .volume = NULL,
                               .parameters = &parameters,
                               .mute = NULL};

diff --git a/audio_stdout.c b/audio_stdout.c
index 37d6f78121765131eaff8dc3a1d3562f5e739a28..0438b1afad88c067cb6886a75ac4d78db752d9bd 100644 (file)
--- a/audio_stdout.c
+++ b/audio_stdout.c
@@ -86,7 +86,6 @@ audio_output audio_stdout = {.name = "stdout",
                              .flush = NULL,
                              .delay = NULL,
                              .play = &play,
-                             .preflight = NULL,
                              .volume = NULL,
                              .parameters = NULL,
                              .mute = NULL};