_tunerCount/_tuners をコピーして使うように変更

[iptd/iPTd.git] / src / ry0 / iPTd / Streaming.h

diff --git a/src/ry0/iPTd/Streaming.h b/src/ry0/iPTd/Streaming.h
index b84968b..44dcbaf 100644 (file)
--- a/src/ry0/iPTd/Streaming.h
+++ b/src/ry0/iPTd/Streaming.h
@@ -5,7 +5,9 @@
 \r
 #pragma once\r
 \r
-#include <Raym/Raym.h>\r
+#include "Raym/Raym.h"\r
+#include "ry0/device/Tuner.h"\r
+\r
 \r
 namespace ry0\r
 {\r
@@ -18,9 +20,12 @@ class Streaming : public Raym::Object,
                   public Raym::TimerDelegate\r
 {\r
 private:\r
-    Controller *        _controller;\r
-    Raym::Dictionary *  _ctrls;           // 制御情報\r
-    Raym::Timer *       _timer_periodic;\r
+    Controller *           _controller;\r
+    int                    _tuner_count;\r
+    ry0::device::Tuner **  _tuners;\r
+\r
+    Raym::Dictionary *     _ctrls;\r
+    Raym::Timer *          _timer_periodic;\r
 \r
 protected:\r
     Streaming();\r
@@ -32,10 +37,8 @@ public:
 \r
     void mapping(int tuner, int channel, int port);\r
 \r
-    // タイマ満了IF (from Timer)\r
-    void timerExpired(Raym::Timer *timer, void *userInfo);\r
+    void timerExpired(Raym::Timer *timer, void *user_info);\r
 };\r
 \r
-\r
 } // iPTd\r
 } // ry0\r