X-Git-Url: http://git.osdn.net/view?a=blobdiff_plain;f=wasapi2%2Fapplication.h;h=a95c449dbc4de8ecca0dbec7ba3a808332459305;hb=10c1ff89266e797140628aad2967e541d54015b7;hp=8c9be532eb899cc76359354e447f4ad396084afc;hpb=d312260236d979ba5136674b5cec3b81625f7d99;p=winaudioj%2Fwasapi2.git

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