Initial work on new audio subsystem

Only works on OS X right now
copernic-us · Nov 21, 2012 · 5fad0bc · 5fad0bc
1 parent 517bc56
commit 5fad0bc
Show file tree

Hide file tree

Showing 17 changed files with 778 additions and 39 deletions.
diff --git a/Makefile b/Makefile
@@ -236,17 +236,7 @@ SRCS += src/text/fontstash.c
 ##############################################################
 # Audio subsys
 ##############################################################
-SRCS += src/audio/audio.c \
- src/audio/audio_decoder.c \
- src/audio/audio_fifo.c \
- src/audio/audio_iec958.c \
-
-SRCS-$(CONFIG_LIBASOUND) += src/audio/alsa/alsa_audio.c
-SRCS-$(CONFIG_LIBPULSE) += src/audio/pulseaudio/pulseaudio.c
-SRCS-$(CONFIG_LIBOGC) += src/audio/wii/wii_audio.c
-SRCS-$(CONFIG_COREAUDIO) += src/audio/coreaudio/coreaudio.c
-SRCS-$(CONFIG_PSL1GHT) += src/audio/ps3/ps3_audio.c
-SRCS += src/audio/dummy/dummy_audio.c
+SRCS += src/audio2/audio.c
 
 ##############################################################
 # DVD

diff --git a/configure.osx b/configure.osx
@@ -152,10 +152,8 @@ echo >>${CONFIG_MAK} "LDFLAGS_cfg += -framework OpenGL"
 echo >>${CONFIG_MAK} "LDFLAGS_cfg += -framework CoreVideo"
 echo >>${CONFIG_MAK} "LDFLAGS_cfg += -weak_framework VideoDecodeAcceleration"
 
-# CoreAudio
-if enabled coreaudio; then
- echo >>${CONFIG_MAK} "LDFLAGS_cfg += -framework CoreAudio"
-fi
+echo >>${CONFIG_MAK} "LDFLAGS_cfg += -framework CoreAudio"
+echo >>${CONFIG_MAK} "LDFLAGS_cfg += -framework AudioToolBox"
 
 # Carbon, Remote Control Wrapper uses it
 if enabled appleremote; then

diff --git a/src/arch/osx/osx_app.m b/src/arch/osx/osx_app.m
@@ -17,6 +17,7 @@
  */
 
 #import <AppKit/AppKit.h>
+#import <CoreAudio/HostTime.h>
 
 #include <sys/types.h>
 #include <sys/sysctl.h>
@@ -34,6 +35,15 @@
 static void mainloop_courier_init(void);
 
 
+/**
+ *
+ */
+int64_t
+showtime_get_avtime(void)
+{
+ return AudioConvertHostTimeToNanos(AudioGetCurrentHostTime()) / 1000LL;
+}
+
 /**
  *
  */

diff --git a/src/audio/audio.c b/src/audio/audio.c
@@ -45,17 +45,6 @@ static int audio_run = 1;
 static hts_thread_t audio_thread_id;
 audio_fifo_t af0, *thefifo;
 
-
-/**
- *
- */
-int
-audio_mode_prefer_float(void)
-{
- return audio_mode_current && audio_mode_current->am_float;
-}
-
-
 /**
  *
  */

diff --git a/src/audio/audio_defs.h b/src/audio/audio_defs.h
@@ -82,8 +82,6 @@ extern prop_t *prop_mastervol, *prop_mastermute;
 
 #define CLIP16(a) ((a) > 32767 ? 32767 : ((a) < -32768 ? -32768 : a))
 
-int audio_mode_prefer_float(void);
-
 /**
  * Audio drivers
  */