Commit: 174ef94a2e68290f101498d88c76f88371cb2cef - timidity41 (git)

Commit MetaInfo

• Revision: 174ef94a2e68290f101498d88c76f88371cb2cef (tree)
• Time: 2017-08-26 06:38:38
• Author: Starg <starg@user...>
• Commiter: Starg

Log Message

Add suuport for portaudio WASAPI

Change Summary

• modified: timidity/output.c
• modified: timidity/portaudio_a.c

Incremental Difference

--- a/timidity/output.c
+++ b/timidity/output.c
@@ -97,6 +97,7 @@ extern PlayMode portaudio_play_mode;
 extern PlayMode portaudio_asio_play_mode;
 extern PlayMode portaudio_win_ds_play_mode;
 extern PlayMode portaudio_win_wmme_play_mode;
+extern PlayMode portaudio_win_wasapi_play_mode;
 #endif
 #endif /* AU_PORTAUDIO */
 
@@ -169,6 +170,7 @@ PlayMode *play_mode_list[] = {
   &portaudio_asio_play_mode,
   &portaudio_win_ds_play_mode,
   &portaudio_win_wmme_play_mode,
+  &portaudio_win_wasapi_play_mode,
 #endif
 #endif /* AU_PORTAUDIO */
 

--- a/timidity/portaudio_a.c
+++ b/timidity/portaudio_a.c
@@ -116,6 +116,7 @@ padata_t pa_data;
 static int open_output_asio(void);
 static int open_output_win_ds(void);
 static int open_output_win_wmme(void);
+static int open_output_win_wasapi(void);
 PlayMode portaudio_asio_play_mode = {
 	(SAMPLE_RATE),
     PE_16BIT|PE_SIGNED,
@@ -155,6 +156,19 @@ PlayMode portaudio_win_wmme_play_mode = {
     output_data,
     acntl
 };
+PlayMode portaudio_win_wasapi_play_mode = {
+    (SAMPLE_RATE),
+    PE_16BIT | PE_SIGNED,
+    PF_PCM_STREAM | PF_BUFF_FRAGM_OPT | PF_CAN_TRACE,
+    -1,
+    {32}, /* PF_BUFF_FRAGM_OPT  is need for TWSYNTH */
+    "PortAudio(WASAPI)", 'W',
+    NULL,
+    open_output_win_wasapi,
+    close_output,
+    output_data,
+    acntl
+};
 PlayMode * volatile portaudio_play_mode = &portaudio_win_wmme_play_mode;
 #define dpm (*portaudio_play_mode)
 
@@ -291,6 +305,11 @@ static int open_output_win_wmme(void)
 	portaudio_play_mode = &portaudio_win_wmme_play_mode;
 	return open_output();
 }
+static int open_output_win_wasapi(void)
+{
+    portaudio_play_mode = &portaudio_win_wasapi_play_mode;
+    return open_output();
+}
 #endif
 
 static int open_output(void)
@@ -313,7 +332,9 @@ static int open_output(void)
 			HostApiTypeId = paDirectSound;
 		} else if(&dpm == &portaudio_win_wmme_play_mode){
 			HostApiTypeId = paMME;
-		} else {
+        } else if(&dpm == &portaudio_win_wasapi_play_mode){
+            HostApiTypeId = paWASAPI;
+        } else {
 			return -1;
 		}
 		if(load_portaudio_dll(0))