Changeset 9867

Timestamp:

03/05/09 16:31:03 (4 years ago)

Author:

robert

Message:

Updated wrappers and dev release version numbers

Location:

OpenSceneGraph/trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• include/osg/Version (modified) (1 diff)
• src/osgWrappers/osg/AudioStream.cpp (added)
• src/osgWrappers/osg/ImageStream.cpp (modified) (5 diffs)

OpenSceneGraph/trunk/CMakeLists.txt

@@ -29 +29 @@
 SET(OPENSCENEGRAPH_MAJOR_VERSION 2)
 SET(OPENSCENEGRAPH_MINOR_VERSION 9)
-SET(OPENSCENEGRAPH_PATCH_VERSION 0)
-SET(OPENSCENEGRAPH_SOVERSION 55)
+SET(OPENSCENEGRAPH_PATCH_VERSION 1)
+SET(OPENSCENEGRAPH_SOVERSION 56)
 
 # set to 0 when not a release candidate, non zero means that any generated 

OpenSceneGraph/trunk/include/osg/Version

@@ -22 +22 @@
 #define OPENSCENEGRAPH_MAJOR_VERSION    2
 #define OPENSCENEGRAPH_MINOR_VERSION    9
-#define OPENSCENEGRAPH_PATCH_VERSION    0
-#define OPENSCENEGRAPH_SOVERSION        55
+#define OPENSCENEGRAPH_PATCH_VERSION    1
+#define OPENSCENEGRAPH_SOVERSION        56
 
 /**

OpenSceneGraph/trunk/src/osgWrappers/osg/ImageStream.cpp

@@ -11 +11 @@
 #include <osgIntrospection/Attributes>
 
+#include <osg/AudioStream>
 #include <osg/CopyOp>
 #include <osg/Image>
@@ -38 +39 @@
 END_REFLECTOR
 
+TYPE_NAME_ALIAS(std::vector< osg::ref_ptr< osg::AudioStream > >, osg::ImageStream::AudioStreams)
+
 BEGIN_OBJECT_REFLECTOR(osg::ImageStream)
         I_DeclaringFile("osg/ImageStream");
@@ -153 +156 @@
                   "",
                   "");
+        I_Method1(void, setAudioStreams, IN, const osg::ImageStream::AudioStreams &, asl,
+                  Properties::NON_VIRTUAL,
+                  __void__setAudioStreams__C5_AudioStreams_R1,
+                  "",
+                  "");
+        I_Method0(osg::ImageStream::AudioStreams &, getAudioStreams,
+                  Properties::NON_VIRTUAL,
+                  __AudioStreams_R1__getAudioStreams,
+                  "",
+                  "");
+        I_Method0(const osg::ImageStream::AudioStreams &, getAudioStreams,
+                  Properties::NON_VIRTUAL,
+                  __C5_AudioStreams_R1__getAudioStreams,
+                  "",
+                  "");
         I_ProtectedMethod0(void, applyLoopingMode,
                            Properties::VIRTUAL,
@@ -159 +177 @@
                            "",
                            "");
+        I_SimpleProperty(const osg::ImageStream::AudioStreams &, AudioStreams, 
+                         __C5_AudioStreams_R1__getAudioStreams, 
+                         __void__setAudioStreams__C5_AudioStreams_R1);
         I_SimpleProperty(double, Length, 
                          __double__getLength, 
@@ -179 +200 @@
 END_REFLECTOR
 
+BEGIN_VALUE_REFLECTOR(osg::ref_ptr< osg::AudioStream >)
+        I_DeclaringFile("osg/ref_ptr");
+        I_Constructor0(____ref_ptr,
+                       "",
+                       "");
+        I_Constructor1(IN, osg::AudioStream *, ptr,
+                       Properties::NON_EXPLICIT,
+                       ____ref_ptr__T_P1,
+                       "",
+                       "");
+        I_Constructor1(IN, const osg::ref_ptr< osg::AudioStream > &, rp,
+                       Properties::NON_EXPLICIT,
+                       ____ref_ptr__C5_ref_ptr_R1,
+                       "",
+                       "");
+        I_Method0(osg::AudioStream *, get,
+                  Properties::NON_VIRTUAL,
+                  __T_P1__get,
+                  "",
+                  "");
+        I_Method0(bool, valid,
+                  Properties::NON_VIRTUAL,
+                  __bool__valid,
+                  "",
+                  "");
+        I_Method0(osg::AudioStream *, release,
+                  Properties::NON_VIRTUAL,
+                  __T_P1__release,
+                  "",
+                  "");
+        I_Method1(void, swap, IN, osg::ref_ptr< osg::AudioStream > &, rp,
+                  Properties::NON_VIRTUAL,
+                  __void__swap__ref_ptr_R1,
+                  "",
+                  "");
+        I_SimpleProperty(osg::AudioStream *, , 
+                         __T_P1__get, 
+                         0);
+END_REFLECTOR
+
+STD_VECTOR_REFLECTOR(std::vector< osg::ref_ptr< osg::AudioStream > >)
+