Changeset 1370

Timestamp:

03/25/08 12:20:32 (8 months ago)

Author:

timdewhirst

Message:

olibs
- revert patch level to 0
- make errors go to cerr, not wcerr
- update missed version in sdl_plugin.opl

Location:

trunk

Files:

• CMakeLists.txt (modified) (1 diff)
• src/openmedialib/ml/utilities.cpp (modified) (2 diffs)
• src/openmedialib/plugins/sdl/sdl_plugin.opl (modified) (1 diff)

trunk/CMakeLists.txt

@@ -3 +3 @@
 set( VERSION_MAJOR 0 )
 set( VERSION_MINOR 5 )
-set( VERSION_PATCH 1 )
+set( VERSION_PATCH 0 )
 set( PACKAGE "openlibraries-${VERSION_MAJOR}.${VERSION_MINOR}.${VERSION_PATCH}" )
 set( VERSION_STRING "${VERSION_MAJOR}_${VERSION_MINOR}_${VERSION_PATCH}" )

trunk/src/openmedialib/ml/utilities.cpp

@@ -460 +460 @@
         openmedialib_plugin_ptr plug = get_plug( resource, L"input" );
         if ( plug == 0 )
-            std::wcerr << "create_input: failed to find a plugin for: " << resource << "\n";
+            std::cerr << "create_input: failed to find a plugin for: " << pl::to_string( resource ) << "\n";
         return plug == 0 ? input_type_ptr( ) : plug->input( resource );
 }
@@ -485 +485 @@
         openmedialib_plugin_ptr plug = get_plug( resource, L"output" );
         if ( plug == 0 )
-            std::wcerr << "create_store: failed to find a plugin for: " << resource << "\n";
+            std::cerr << "create_store: failed to find a plugin for: " << pl::to_string( resource ) << "\n";
  
         return plug == 0 ? result : plug->store( resource, frame );

trunk/src/openmedialib/plugins/sdl/sdl_plugin.opl

@@ -3 +3 @@
         <!-- plugins go here -->
         <openmedialib name="oml" version="0.1.0">
-                <plugin name="OpenLibraries sdl plugin" type="output" extension='"sdl:", "sdl_video:", "sdl_audio:"' merit="0" filename='"libopenmedialib_sdl.so", "libopenmedialib_sdl.dylib", "openmedialib_sdl-vc71-d-0_4_1.dll", "openmedialib_sdl-vc71-r-0_4_1.dll", "openmedialib_sdl-vc80-d-0_4_1.dll", "openmedialib_sdl-vc80-r-0_4_1.dll"'/>
+                <plugin name="OpenLibraries sdl plugin" type="output" extension='"sdl:", "sdl_video:", "sdl_audio:"' merit="0" filename='"libopenmedialib_sdl.so", "libopenmedialib_sdl.dylib", "openmedialib_sdl-vc71-d-0_5_0.dll", "openmedialib_sdl-vc71-r-0_5_0.dll", "openmedialib_sdl-vc80-d-0_5_0.dll", "openmedialib_sdl-vc80-r-0_5_0.dll"'/>
         </openmedialib>
 </openlibraries>