Commit: 9ac54d5b9b21fa4c0bdf0b0ba61d37ba9b6198ea - timidity_mod (git)

TiMidity++ 改造版 (Windows 専用)

Commit MetaInfo

• Revision: 9ac54d5b9b21fa4c0bdf0b0ba61d37ba9b6198ea (tree)
• Time: 2017-11-11 20:39:35
• Author: Starg <starg@user...>
• Commiter: Starg

Log Message

Start adding WASAPI support.

Change Summary

• modified: CMakeLists.txt
• modified: timidity/CMakeLists.txt
• modified: timidity/output.c
• add: timidity/wasapi_a.c

Incremental Difference

--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,6 +7,7 @@ set(TIMIDITY_AUDIO_GOGO FALSE CACHE BOOL "GOGO")
 set(TIMIDITY_AUDIO_VORBIS FALSE CACHE BOOL "vorbis")
 set(TIMIDITY_AUDIO_FLAC FALSE CACHE BOOL "flac")
 set(TIMIDITY_AUDIO_PORTAUDIO FALSE CACHE BOOL "portaudio")
+set(TIMIDITY_AUDIO_WASAPI TRUE CACHE BOOL "WASAPI")
 
 set(PORTAUDIO_INCLUDE_DIR "." CACHE PATH "portaudio include dir")
 
@@ -86,6 +87,12 @@ if(TIMIDITY_AUDIO_PORTAUDIO)
     include_directories("${PORTAUDIO_INCLUDE_DIR}")
 endif()
 
+if(TIMIDITY_AUDIO_WASAPI)
+	add_definitions(
+		-DAU_WASAPI
+	)
+endif()
+
 if(TIMIDITY_INTERFACE_W32GUI)
     add_definitions(
         -DIA_W32GUI

--- a/timidity/CMakeLists.txt
+++ b/timidity/CMakeLists.txt
@@ -155,6 +155,13 @@ if(TIMIDITY_AUDIO_PORTAUDIO)
     )
 endif()
 
+if(TIMIDITY_AUDIO_WASAPI)
+	list(
+		APPEND TiMiditySources
+		wasapi_a.c
+	)
+endif()
+
 if(TIMIDITY_INTERFACE_W32GUI)
     add_executable(timw32g WIN32 ${TiMiditySources})
     target_link_libraries(timw32g ${TiMidityLibs})

--- a/timidity/output.c
+++ b/timidity/output.c
@@ -101,6 +101,11 @@ extern PlayMode portaudio_win_wasapi_play_mode;
 #endif
 #endif /* AU_PORTAUDIO */
 
+#ifdef AU_WASAPI
+extern PlayMode wasapi_shared_play_mode;
+extern PlayMode wasapi_exclusive_play_mode;
+#endif /* AU_WASAPI */
+
 #ifdef AU_NPIPE
 extern PlayMode npipe_play_mode;
 #endif /* AU_NPIPE */
@@ -174,6 +179,11 @@ PlayMode *play_mode_list[] = {
 #endif
 #endif /* AU_PORTAUDIO */
 
+#if defined(AU_WASAPI)
+  &wasapi_shared_play_mode,
+  &wasapi_exclusive_play_mode,
+#endif /* AU_WASAPI */
+
 #if defined(AU_NPIPE)
   &npipe_play_mode,
 #endif /*AU_NPIPE*/

--- /dev/null
+++ b/timidity/wasapi_a.c
@@ -0,0 +1,107 @@
+/*
+TiMidity++ -- MIDI to WAVE converter and player
+Copyright (C) 1999-2002 Masanao Izumo <[e-mail]>
+Copyright (C) 1995 Tuukka Toivonen <[e-mail]>
+
+This program is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+This program is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+GNU General Public License for more details.
+
+You should have received a copy of the GNU General Public License
+along with this program; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+wasapi_a.c
+
+Functions to play sound using WASAPI (Windows 7+).
+
+Written by Starg.
+*/
+
+#ifdef HAVE_CONFIG_H
+#include "config.h"
+#endif /* HAVE_CONFIG_H */
+#ifdef __W32__
+#include "interface.h"
+#endif
+#include <stdio.h>
+#include <stdlib.h>
+#ifndef NO_STRING_H
+#include <string.h>
+#else
+#include <strings.h>
+#endif
+#include <windows.h>
+
+#ifdef AU_WASAPI
+
+#include "timidity.h"
+#include "output.h"
+
+int WASAPIOpenOutputShared(void)
+{
+    return -1;
+}
+
+int WASAPIOpenOutputExclusive(void)
+{
+    return -1;
+}
+
+void WASAPICloseOutput(void)
+{
+
+}
+
+int WASAPIOutputData(char* pData, int32 size)
+{
+    return -1;
+}
+
+int WASAPIACntl(int request, void* pArg)
+{
+    return -1;
+}
+
+int WASAPIDetect(void)
+{
+    return 0;
+}
+
+PlayMode wasapi_shared_play_mode = {
+    DEFAULT_RATE,
+    PE_16BIT | PE_SIGNED,
+    PF_PCM_STREAM | PF_CAN_TRACE | PF_BUFF_FRAGM_OPT,
+    -1,
+    {32},
+    "WASAPI (Shared)", 'x',
+    NULL,
+    &WASAPIOpenOutputShared,
+    &WASAPICloseOutput,
+    &WASAPIOutputData,
+    &WASAPIACntl,
+    &WASAPIDetect
+};
+
+PlayMode wasapi_exclusive_play_mode = {
+    DEFAULT_RATE,
+    PE_16BIT | PE_SIGNED,
+    PF_PCM_STREAM | PF_CAN_TRACE | PF_BUFF_FRAGM_OPT,
+    -1,
+    {32},
+    "WASAPI (Exclusive)", 'X',
+    NULL,
+    &WASAPIOpenOutputExclusive,
+    &WASAPICloseOutput,
+    &WASAPIOutputData,
+    &WASAPIACntl,
+    &WASAPIDetect
+};
+
+#endif /* AU_WASAPI */