非同期エージェントライブラリにてスレッド部分を書き換えてみた。

[winaudioj/wasapi2.git] / wasapi2 / application.h

diff --git a/wasapi2/application.h b/wasapi2/application.h
index 8c9be53..a95c449 100644 (file)
--- a/wasapi2/application.h
+++ b/wasapi2/application.h
@@ -28,10 +28,10 @@
 #include "async_reader.h"\r
 #include "sf_memory.h"\r
 #include "toplevel_window.h"\r
-#include "reader_thread.h"\r
-#include "output_thread.h"\r
-#include "input_thread.h"\r
-#include "mixer_thread.h"\r
+#include "reader_agent.h"\r
+#include "output_agent.h"\r
+#include "input_agent.h"\r
+#include "mixer_agent.h"\r
 #include "sequencer.h"\r
 \r
 namespace sf {\r
@@ -81,15 +81,15 @@ public:
   void reader_pause();\r
   void reader_stop();\r
   void reader_end();\r
-  uint64_t reader_position() {return reader_thread_.position();}\r
-  void reader_position(uint64_t pos){reader_thread_.position(pos);}\r
-  uint64_t reader_data_size(){return reader_thread_.size();}\r
-  void reader_repeat_mode(bool v){ reader_thread_.repeat_mode(v);}\r
-  bool reader_repeat_mode(){ return reader_thread_.repeat_mode();}\r
-  int reader_status(std::memory_order o = std::memory_order_seq_cst) {return reader_thread_.status(o);}\r
-  ringbuffer_t& reader_ringbuffer() {return reader_thread_.ringbuffer();}\r
+  uint64_t reader_position() {return reader_agent_.position();}\r
+  void reader_position(uint64_t pos){reader_agent_.position(pos);}\r
+  uint64_t reader_data_size(){return reader_agent_.size();}\r
+  void reader_repeat_mode(bool v){ reader_agent_.repeat_mode(v);}\r
+  bool reader_repeat_mode(){ return reader_agent_.repeat_mode();}\r
+  int reader_status(std::memory_order o = std::memory_order_seq_cst) {return reader_agent_.status(o);}\r
+  ringbuffer_t& reader_ringbuffer() {return reader_agent_.ringbuffer();}\r
 private:\r
-  reader_thread_t reader_thread_;\r
+  reader_agent_t reader_agent_;\r
 \r
 // ----------------------------\r
 // WASAPI出力関係\r
@@ -97,33 +97,33 @@ private:
 // 出力デバイスの設定・変更\r
 public:\r
   void apply_output_device_config(int device_index,wasapi_device_manager::device_info::params_t& params);\r
-  audio_base& output_device() {return output_thread_.device();}\r
-  ringbuffer_t& output_ringbuffer() {return output_thread_.ringbuffer();}\r
-  output_thread_t& output_thread(){return output_thread_;}\r
+  audio_base& output_device() {return output_agent_.device();}\r
+  ringbuffer_t& output_ringbuffer() {return output_agent_.ringbuffer();}\r
+  output_agent_t& output_thread(){return output_agent_;}\r
 private:\r
-  output_thread_t output_thread_;\r
+  output_agent_t output_agent_;\r
 // -----------------------------  \r
 // WASAPI入力関係\r
 // -----------------------------  \r
 public:\r
   void apply_input_device_config(int device_index,wasapi_device_manager::device_info::params_t& params)\r
   {\r
-      input_thread_.apply_config(device_index,params);\r
+      input_agent_.apply_config(device_index,params);\r
   };\r
-  audio_base& input_device() {return input_thread_.device();}\r
-  ringbuffer_t& input_ringbuffer() {return input_thread_.ringbuffer();}\r
-  input_thread_t& input_thread(){return input_thread_;}\r
+  audio_base& input_device() {return input_agent_.device();}\r
+  ringbuffer_t& input_ringbuffer() {return input_agent_.ringbuffer();}\r
+  input_agent_t& input_thread(){return input_agent_;}\r
 private:\r
-  input_thread_t input_thread_;\r
+  input_agent_t input_agent_;\r
 \r
 // -----------------------------  \r
 // ミキサー関係\r
 // -----------------------------  \r
 public:\r
-  ringbuffer_t& mixer_ringbuffer(){return mixer_thread_.ringbuffer();}\r
-  mixer_thread_t& mixer_thread(){return mixer_thread_;}\r
+  ringbuffer_t& mixer_ringbuffer(){return mixer_agent_.ringbuffer();}\r
+  mixer_agent_t& mixer_thread(){return mixer_agent_;}\r
 private:\r
-  mixer_thread_t mixer_thread_;\r
+  mixer_agent_t mixer_agent_;\r
 \r
 // -----------------------------  \r
 // その他\r