1.JMFライブラリのリファクタリング。

[nyartoolkit-and/nyartoolkit-and.git] / trunk / sample / sandbox / jp / nyatla / nyartoolkit / sandbox / qrcode / SingleQrSample.java

diff --git a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/SingleQrSample.java b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/SingleQrSample.java
index 72720fd..1cbd761 100644 (file)
--- a/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/SingleQrSample.java
+++ b/trunk/sample/sandbox/jp/nyatla/nyartoolkit/sandbox/qrcode/SingleQrSample.java
@@ -55,7 +55,7 @@ public class SingleQrSample implements GLEventListener, JmfCaptureListener
 \r
        private GLNyARRaster_RGB _cap_image;\r
 \r
-       private JmfCameraCapture _capture;\r
+       private JmfCaptureDevice _capture;\r
 \r
        private GL _gl;\r
        private NyARGLUtil _glnya;\r
@@ -138,8 +138,11 @@ public class SingleQrSample implements GLEventListener, JmfCaptureListener
                //NyARToolkitの準備\r
                try {\r
                        //キャプチャの準備\r
-                       _capture = new JmfCameraCapture(SCREEN_X, SCREEN_Y, 15f, JmfCameraCapture.PIXEL_FORMAT_RGB);\r
-                       _capture.setCaptureListener(this);\r
+                       JmfCaptureDeviceList list=new JmfCaptureDeviceList();\r
+                       _capture=list.getDevice(0);\r
+                       _capture.setCaptureFormat(SCREEN_X, SCREEN_Y, 15f);\r
+                       _capture.setOnCapture(this);\r
+                       \r
                        //NyARToolkitの準備\r
                        _ar_param = new NyARParam();\r
                        NyARCode ar_code = new NyARCode(16, 16);\r
@@ -151,7 +154,7 @@ public class SingleQrSample implements GLEventListener, JmfCaptureListener
                        //NyARToolkit用の支援クラス\r
                        _glnya = new NyARGLUtil(_gl);\r
                        //GL対応のRGBラスタオブジェクト\r
-                       _cap_image = new GLNyARRaster_RGB(_ar_param);\r
+                       _cap_image = new GLNyARRaster_RGB(_ar_param,_capture.getCaptureFormat());\r
                        //キャプチャ開始\r
                        _capture.start();\r
                } catch (Exception e) {\r
@@ -223,7 +226,7 @@ public class SingleQrSample implements GLEventListener, JmfCaptureListener
        {\r
                try {\r
                        synchronized (_cap_image) {\r
-                               _cap_image.setBuffer(i_buffer, true);\r
+                               _cap_image.setBuffer(i_buffer);\r
                        }\r
                } catch (Exception e) {\r
                        e.printStackTrace();\r