Replaced audio/audio.h with audio/types.h includes

audio/audio.h should not be used as a catch-all header for audio.

src/audio/audio.h

@@ -54,8 +54,6 @@
 
 #include "audio/types.h"
 
-extern int audio_init_state_ok;
-
 struct module;
 struct state_audio;
 
@@ -90,6 +88,8 @@ struct state_audio * audio_cfg_init(struct module *parent,
 extern "C" {
 #endif
 
+extern int audio_init_state_ok;
+
 void audio_start(struct state_audio *s);
 void audio_done(struct state_audio *s);
 void audio_join(struct state_audio *s);

src/audio/audio_capture.c

@@ -50,9 +50,8 @@
 #include "host.h"
 
 #include "audio/audio_capture.h"
-
-#include "audio/audio.h"
 #include "audio/capture/sdi.h"
+#include "audio/types.h"
 
 /* vidcap flags */
 #include "video_capture.h"

src/audio/audio_capture.h

@@ -54,6 +54,7 @@ struct audio_capture_info {
 struct state_audio_capture;
 struct audio_frame;
 
+extern int audio_init_state_ok;
 
 void                        audio_capture_init_devices(void);
 void                        audio_capture_print_help(bool);

src/audio/audio_playback.c

@@ -45,9 +45,9 @@
 #include <string.h>
 #include <stdlib.h>
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
 #include "audio/playback/sdi.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"

src/audio/audio_playback.h

@@ -36,12 +36,16 @@
  */
 
 #include "../types.h"
-#include "audio/audio.h"
+
+struct audio_desc;
+struct audio_frame;
 
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+extern int audio_init_state_ok;
+
 #define AUDIO_PLAYBACK_ABI_VERSION 5
 
 /** @anchor audio_playback_ctl_reqs

src/audio/capture/alsa.c

@@ -55,8 +55,8 @@
 #ifdef HAVE_ALSA
 
 #include "alsa_common.h"
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 
 #include "debug.h"

src/audio/capture/coreaudio.m

@@ -50,9 +50,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
 #include "audio/playback/coreaudio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "host.h"

src/audio/capture/jack.c

@@ -47,8 +47,8 @@
 #include "debug.h"
 #include "host.h"
 
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "lib_common.h"
 #include "utils/ring_buffer.h"

src/audio/capture/portaudio.c

@@ -60,9 +60,9 @@
 
 #include <portaudio.h> /* from PortAudio API */
 
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
 #include "audio/portaudio_common.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"

src/audio/capture/sdi.cpp

@@ -41,9 +41,9 @@
 #include "config_win32.h"
 #endif // HAVE_CONFIG_H
 
-#include "audio/audio.h" 
 #include "audio/audio_capture.h"
-#include "audio/capture/sdi.h" 
+#include "audio/capture/sdi.h"
+#include "audio/types.h"
 
 #include "debug.h"
 #include "host.h"

src/audio/capture/testcard.cpp

@@ -44,7 +44,7 @@
 #endif
 
 #include "audio/audio_capture.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "audio/wav_reader.h"
 #include "debug.h"

src/audio/capture/wasapi.cpp

@@ -40,7 +40,6 @@
 #include <string>
 #include <windows.h>
 
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
 #include "audio/types.h"
 #include "debug.h"

src/audio/codec.h

@@ -49,7 +49,7 @@
 #ifndef AUDIO_CODEC_H_
 #define AUDIO_CODEC_H_
 
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #define AUDIO_COMPRESS_ABI_VERSION 2
 

src/audio/echo.h

@@ -49,12 +49,11 @@
 #ifndef _ECHO_H_
 #define _ECHO_H_
 
-#include "audio/audio.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
+struct audio_frame;
 struct echo_cancellation;
 
 typedef struct echo_cancellation echo_cancellation_t;

src/audio/jack.c

@@ -52,8 +52,8 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "audio/audio.h"
 #include "audio/jack.h"
+#include "audio/types.h"
 #include "jack_common.h"
 #include "pthread.h"
 #include "rtp/rtp.h"

src/audio/playback/alsa.c

@@ -52,8 +52,8 @@
 #include <string.h>
 
 #include "alsa_common.h"
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "lib_common.h"

src/audio/playback/coreaudio.cpp

@@ -57,9 +57,9 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
 #include "audio/playback/coreaudio.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include "rang.hpp"

src/audio/playback/decklink.cpp

@@ -43,8 +43,8 @@
 
 #include <iostream>
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "blackmagic_common.h"
 #include "debug.h"

src/audio/playback/dummy.cpp

@@ -41,8 +41,8 @@
 #include "config_win32.h"
 #endif
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "lib_common.h"
 
 static int state;

src/audio/playback/jack.c

@@ -46,8 +46,8 @@
 #define MAX_PORTS 64
 #define MOD_NAME "[JACK playback] "
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "host.h"

src/audio/playback/mixer.cpp

@@ -42,10 +42,10 @@
 #include "config_win32.h"
 #endif
 
-#include "audio/audio.h"
 #include "audio/audio_capture.h"
 #include "audio/audio_playback.h"
 #include "audio/codec.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include "module.h"

src/audio/playback/none.c

@@ -41,8 +41,8 @@
 #include "config_win32.h"
 #endif
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include <stdlib.h>

src/audio/playback/portaudio.cpp

@@ -62,9 +62,9 @@
 
 #include <portaudio.h> /* from PortAudio */
 
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
 #include "audio/portaudio_common.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include "utils/audio_buffer.h"

src/audio/playback/wasapi.cpp

@@ -43,6 +43,7 @@
 #include <windows.h>
 
 #include "audio/audio_playback.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include "rang.hpp"

src/audio/types.cpp

@@ -42,7 +42,7 @@
 #endif // HAVE_CONFIG_H
 
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #ifdef HAVE_SPEEXDSP

src/audio/utils.cpp

@@ -42,9 +42,9 @@
 #endif // HAVE_CONFIG_H
 
 
-#include "audio/audio.h"
 #include "audio/codec.h"
-#include "audio/utils.h" 
+#include "audio/types.h"
+#include "audio/utils.h"
 #include "debug.h"
 #include <assert.h>
 #include <limits.h>

src/audio/utils.h

@@ -47,7 +47,7 @@
 #include <stdint.h>
 #endif
 
-#include <audio/audio.h>
+#include "audio/types.h"
 
 #ifdef __cplusplus
 double calculate_rms(audio_frame2 *frame, int channel, double *peak);

src/rtp/audio_decoders.cpp

@@ -55,9 +55,9 @@
 #include "rtp/ptime.h"
 #include "rtp/pbuf.h"
 #include "rtp/audio_decoders.h"
-#include "audio/audio.h"
 #include "audio/audio_playback.h"
 #include "audio/codec.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "crypto/crc.h"
 #include "crypto/openssl_decrypt.h"

src/rtp/audio_decoders.h

@@ -35,8 +35,6 @@
  * EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
  */
 
-#include "audio/audio.h"
-
 #ifdef __cplusplus
 extern "C" {
 #endif

src/rtp/pbuf.h

@@ -59,7 +59,7 @@
 /* Internet" Figure 6.8 (page 167) for a diagram.                       [csp] */
 /******************************************************************************/
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "rtp/rtp.h"
 
 #ifdef __cplusplus

src/rtsp/BasicRTSPOnlyServer.hh

@@ -48,7 +48,7 @@
 #include <RTSPServer.hh>
 #include <BasicUsageEnvironment.hh>
 #include "rtsp/rtsp_utils.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "module.h"
 
 

src/rtsp/BasicRTSPOnlySubsession.hh

@@ -49,7 +49,7 @@
 #endif
 
 #include "rtsp/rtsp_utils.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "module.h"
 #include "control_socket.h"
 

src/rtsp/c_basicRTSPOnlyServer.h

@@ -56,7 +56,7 @@
 #include "module.h"
 #include "debug.h"
 #include "rtsp/rtsp_utils.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 
 
 #ifdef __cplusplus

src/transmit.cpp

@@ -62,8 +62,8 @@
 #include "config_win32.h"
 #endif // HAVE_CONFIG_H
 
-#include "audio/audio.h"
 #include "audio/codec.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "crypto/random.h"
 #include "debug.h"

src/transmit.h

@@ -57,7 +57,7 @@
 #ifndef TRANSMIT_H_
 #define TRANSMIT_H_
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "rtp/rtpenc_h264.h"
 #include "types.h"
 

src/video_capture/aggregate.c

@@ -48,7 +48,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/video_capture/aja.cpp

@@ -53,7 +53,7 @@
 #include <winsock2.h>
 #endif
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "host.h"

src/video_capture/aja_win32_utils.cpp

@@ -49,7 +49,7 @@
 #include <string.h>
 
 #include "video.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 
 void remux_channel(char *out, const char *in, int bps, int in_len, int in_stream_channels, int out_stream_channels, int pos_in_stream, int pos_out_stream)

src/video_capture/bluefish444.cpp

@@ -47,7 +47,7 @@
 
 #include "bluefish444_common.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "host.h"

src/video_capture/decklink.cpp

@@ -65,7 +65,7 @@
 #include <vector>
 
 #include "blackmagic_common.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "host.h"

src/video_capture/deltacast.cpp

@@ -53,7 +53,7 @@
 #include <sys/time.h>
 #include <unistd.h>
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "deltacast_common.hpp"

src/video_capture/deltacast_dvi.cpp

@@ -58,7 +58,7 @@
 #include <string>
 #include <unordered_map>
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "host.h"
 #include "deltacast_common.hpp"

src/video_capture/dvs.c

@@ -56,7 +56,7 @@
 
 #ifdef HAVE_DVS           /* From config.h */
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "lib_common.h"
@@ -67,7 +67,6 @@
 #include "tv.h"
 #include "dvs_clib.h"           /* From the DVS SDK */
 #include "dvs_fifo.h"           /* From the DVS SDK */
-#include "audio/audio.h"
 
 struct vidcap_dvs_state {
         sv_handle *sv;

src/video_capture/file.c

@@ -66,7 +66,7 @@
 #include <stdint.h>
 #include <tv.h>
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "lib_common.h"

src/video_capture/gpustitch.cpp

@@ -49,7 +49,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/video_capture/import.cpp

@@ -49,7 +49,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/wav_reader.h"
 #include "keyboard_control.h"
 #include "messaging.h"
@@ -58,7 +58,6 @@
 #include "utils/ring_buffer.h"
 #include "utils/worker.h"
 #include "video_export.h"
-//#include "audio/audio.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/video_capture/ndi.cpp

@@ -64,7 +64,7 @@
 #endif // _WIN64
 #endif // _WIN32
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "debug.h"
 #include "lib_common.h"

src/video_capture/rtsp.cpp

@@ -52,6 +52,7 @@
 #include <pthread.h>
 #include <glib.h>
 
+#include "audio/types.h"
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"
@@ -69,7 +70,6 @@
 #include "video.h"
 #include "video_codec.h"
 #include "video_capture.h"
-#include "audio/audio.h"
 
 #include <curl/curl.h>
 #include <chrono>

src/video_capture/screen_osx.c

@@ -50,8 +50,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/video_capture/screen_x11.c

@@ -49,7 +49,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #include <stdio.h>
 #include <stdlib.h>

src/video_capture/switcher.c

@@ -46,7 +46,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "module.h"
 
 #include <inttypes.h>

src/video_capture/swmix.cpp

@@ -59,7 +59,7 @@
 
 #include "tv.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 
 #include <queue>
 #include <stdio.h>

src/video_capture/testcard.cpp

@@ -82,7 +82,7 @@
 #endif // defined HAVE_SDL2
 #endif /* HAVE_LIBSDL_MIXER */
 #include <vector>
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "utils/video_pattern_generator.hpp"
 
 #define AUDIO_SAMPLE_RATE 48000

src/video_capture/testcard2.c

@@ -64,7 +64,7 @@
 #include <SDL/SDL_ttf.h>
 #endif
 #endif
-#include "audio/audio.h"
+#include "audio/types.h"
 #include <pthread.h>
 #include <time.h>
 #include <limits.h>

src/video_display/bluefish444.cpp

@@ -53,7 +53,7 @@
 
 #include "bluefish444_common.h"
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "debug.h"
 #include "host.h"
 #include "lib_common.h"

src/video_display/decklink.cpp

@@ -49,7 +49,7 @@
 
 #define MOD_NAME "[Decklink display] "
 
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "blackmagic_common.h"
 #include "compat/platform_time.h"
 #include "debug.h"

src/video_display/deltacast.cpp

@@ -49,7 +49,7 @@
 #include "video.h"
 #include "video_display.h"
 #include "debug.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "utils/ring_buffer.h"
 

src/video_display/dvs.c

@@ -56,12 +56,12 @@
 
 #ifdef HAVE_DVS           /* From config.h */
 
+#include "audio/types.h"
 #include "debug.h"
 #include "lib_common.h"
 #include "video.h"
 #include "video_display.h"
 #include "video_display/dvs.h"
-#include "audio/audio.h"
 #include "tv.h"
 #include "utils/ring_buffer.h"
 

src/video_display/sdl.cpp

@@ -49,7 +49,7 @@
 #include "module.h"
 #include "video_display.h"
 #include "tv.h"
-#include "audio/audio.h"
+#include "audio/types.h"
 #include "audio/utils.h"
 #include "utils/ring_buffer.h"
 #include "video.h"