[Jahshaka-cvs] SF.net SVN: openlibraries: [1370] trunk
Status: Beta
Brought to you by:
jahshaka
From: <tim...@us...> - 2008-03-25 17:21:29
|
Revision: 1370 http://openlibraries.svn.sourceforge.net/openlibraries/?rev=1370&view=rev Author: timdewhirst Date: 2008-03-25 10:20:32 -0700 (Tue, 25 Mar 2008) Log Message: ----------- olibs - revert patch level to 0 - make errors go to cerr, not wcerr - update missed version in sdl_plugin.opl Modified Paths: -------------- trunk/CMakeLists.txt trunk/src/openmedialib/ml/utilities.cpp trunk/src/openmedialib/plugins/sdl/sdl_plugin.opl Modified: trunk/CMakeLists.txt =================================================================== --- trunk/CMakeLists.txt 2008-03-20 08:37:34 UTC (rev 1369) +++ trunk/CMakeLists.txt 2008-03-25 17:20:32 UTC (rev 1370) @@ -2,7 +2,7 @@ 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}" ) Modified: trunk/src/openmedialib/ml/utilities.cpp =================================================================== --- trunk/src/openmedialib/ml/utilities.cpp 2008-03-20 08:37:34 UTC (rev 1369) +++ trunk/src/openmedialib/ml/utilities.cpp 2008-03-25 17:20:32 UTC (rev 1370) @@ -459,7 +459,7 @@ { 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 ); } @@ -484,7 +484,7 @@ store_type_ptr result = store_type_ptr( ); 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 ); } Modified: trunk/src/openmedialib/plugins/sdl/sdl_plugin.opl =================================================================== --- trunk/src/openmedialib/plugins/sdl/sdl_plugin.opl 2008-03-20 08:37:34 UTC (rev 1369) +++ trunk/src/openmedialib/plugins/sdl/sdl_plugin.opl 2008-03-25 17:20:32 UTC (rev 1370) @@ -2,6 +2,6 @@ <openlibraries version="1.0"> <!-- 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> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |