Ticket #2265: audiooutputbase.h.diff

audiooutputbase.h

@@ -128 +128 @@
     bool set_initial_vol;
     bool buffer_output_data_for_use; //  used by AudioOutputNULL
     
+    // timestretch
+    soundtouch::SoundTouch * pSoundStretch;
+
+    int audiotime; // timecode of audio leaving the soundcard (same units as
+                   //                                          timecodes) ...
+
+    int audbuf_timecode;    /* timecode of audio most recently placed into
+                   buffer */
+
  private:
     // resampler
     bool need_resampler;
@@ -137 +146 @@
     float src_out[AUDIO_SRC_OUT_SIZE];
     short tmp_buff[AUDIO_TMP_BUF_SIZE];
 
-    // timestretch
-    soundtouch::SoundTouch * pSoundStretch;
-
     bool blocking; // do AddSamples calls block?
 
     int lastaudiolen;
@@ -155 +161 @@
 
     pthread_mutex_t avsync_lock; /* must hold avsync_lock to read or write
                                     'audiotime' and 'audiotime_updated' */
-    int audiotime; // timecode of audio leaving the soundcard (same units as
-                   //                                          timecodes) ...
     struct timeval audiotime_updated; // ... which was last updated at this time
 
     /* Audio circular buffer */
     unsigned char audiobuffer[AUDBUFSIZE];  /* buffer */
     int raud, waud;     /* read and write positions */
-    int audbuf_timecode;    /* timecode of audio most recently placed into
-                   buffer */
 
     int numlowbuffer;