[Hdrflow-svn] SF.net SVN: hdrflow: [108] lib/openlibraries/src/openmedialib/plugins/ofx/ ofx_plugin
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
[Hdrflow-svn] SF.net SVN: hdrflow: [108] lib/openlibraries/src/openmedialib/plugins/ofx/ ofx_plugin.cpp
|
From: <gl...@us...> - 2007-05-01 00:51:01
|
Revision: 108
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=108&view=rev
Author: glslang
Date: 2007-04-30 17:50:58 -0700 (Mon, 30 Apr 2007)
Log Message:
-----------
+ explicit initialisation of OFX string to pl::strings
Modified Paths:
--------------
lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
Modified: lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp
===================================================================
--- lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-04-30 23:56:54 UTC (rev 107)
+++ lib/openlibraries/src/openmedialib/plugins/ofx/ofx_plugin.cpp 2007-05-01 00:50:58 UTC (rev 108)
@@ -1050,18 +1050,18 @@
render_scale[ 0 ] = 1.0;
render_scale[ 1 ] = 1.0;
- image_props_.append( image_prop_type_ = kOfxTypeImage );
- image_props_.append( image_effect_prop_pixel_depth_ = kOfxBitDepthNone );
- image_props_.append( image_effect_prop_components_ = kOfxImageComponentNone );
- image_props_.append( image_effect_prop_pre_multiplication_ = kOfxImageUnPreMultiplied );
+ image_props_.append( image_prop_type_ = pl::string( kOfxTypeImage ) );
+ image_props_.append( image_effect_prop_pixel_depth_ = pl::string( kOfxBitDepthNone ) );
+ image_props_.append( image_effect_prop_components_ = pl::string( kOfxImageComponentNone ) );
+ image_props_.append( image_effect_prop_pre_multiplication_ = pl::string( kOfxImageUnPreMultiplied ) );
image_props_.append( image_effect_prop_render_scale_ = render_scale );
image_props_.append( image_prop_pixel_aspect_ratio_ = 1.0 );
image_props_.append( image_prop_data_ = ( void* ) 0 );
image_props_.append( image_prop_bounds_ = int_vec( 4 ) );
image_props_.append( image_prop_region_of_definition_ = int_vec( 4 ) );
image_props_.append( image_prop_row_bytes_ = 0 );
- image_props_.append( image_prop_field_ = kOfxImageFieldNone );
- image_props_.append( image_prop_unique_identifier_ = "No Unique Identifier" );
+ image_props_.append( image_prop_field_ = pl::string( kOfxImageFieldNone ) );
+ image_props_.append( image_prop_unique_identifier_ = pl::string( "No Unique Identifier" ) );
}
private:
@@ -1105,15 +1105,15 @@
private:
void set_clip_descriptor_properties( )
{
- clip_descriptor_props_.append( clip_descriptor_prop_type_ = kOfxTypeClip );
- clip_descriptor_props_.append( clip_descriptor_prop_name_ = "" );
- clip_descriptor_props_.append( clip_descriptor_prop_label_ = "" );
- clip_descriptor_props_.append( clip_descriptor_prop_short_label_ = "" );
- clip_descriptor_props_.append( clip_descriptor_prop_long_label_ = "" );
+ clip_descriptor_props_.append( clip_descriptor_prop_type_ = pl::string( kOfxTypeClip ) );
+ clip_descriptor_props_.append( clip_descriptor_prop_name_ = pl::string( "" ) );
+ clip_descriptor_props_.append( clip_descriptor_prop_label_ = pl::string( "" ) );
+ clip_descriptor_props_.append( clip_descriptor_prop_short_label_ = pl::string( "" ) );
+ clip_descriptor_props_.append( clip_descriptor_prop_long_label_ = pl::string( "" ) );
clip_descriptor_props_.append( clip_descriptor_prop_supported_components_ = string_vec( ) );
clip_descriptor_props_.append( clip_descriptor_prop_temporal_clip_access_ = 0 );
clip_descriptor_props_.append( clip_descriptor_prop_optional_ = 0 );
- clip_descriptor_props_.append( clip_descriptor_prop_field_extraction_ = kOfxImageFieldDoubled );
+ clip_descriptor_props_.append( clip_descriptor_prop_field_extraction_ = pl::string( kOfxImageFieldDoubled ) );
clip_descriptor_props_.append( clip_descriptor_prop_is_mask_ = 0 );
clip_descriptor_props_.append( clip_descriptor_prop_supports_tiles_ = 1 );
}
@@ -1198,14 +1198,14 @@
string_vec pixel_depths;
pixel_depths.push_back( kOfxBitDepthNone );
- effect_descriptor_props_.append( image_effect_prop_type_ = kOfxTypeImageEffect );
- effect_descriptor_props_.append( image_effect_prop_label_ = kOfxTypeImageEffect );
- effect_descriptor_props_.append( image_effect_prop_short_label_ = kOfxTypeImageEffect );
- effect_descriptor_props_.append( image_effect_prop_long_label_ = kOfxTypeImageEffect );
+ effect_descriptor_props_.append( image_effect_prop_type_ = pl::string( kOfxTypeImageEffect ) );
+ effect_descriptor_props_.append( image_effect_prop_label_ = pl::string( kOfxTypeImageEffect ) );
+ effect_descriptor_props_.append( image_effect_prop_short_label_ = pl::string( kOfxTypeImageEffect ) );
+ effect_descriptor_props_.append( image_effect_prop_long_label_ = pl::string( kOfxTypeImageEffect ) );
effect_descriptor_props_.append( image_effect_prop_supported_contexts_ = string_vec( ) );
- effect_descriptor_props_.append( image_effect_prop_grouping_ = "" );
+ effect_descriptor_props_.append( image_effect_prop_grouping_ = pl::string( "" ) );
effect_descriptor_props_.append( image_effect_prop_single_instance_ = 0 );
- effect_descriptor_props_.append( image_effect_render_thread_safety_ = kOfxImageEffectRenderUnsafe );
+ effect_descriptor_props_.append( image_effect_render_thread_safety_ = pl::string( kOfxImageEffectRenderUnsafe ) );
effect_descriptor_props_.append( image_effect_prop_host_frame_threading_ = 0 );
effect_descriptor_props_.append( image_effect_prop_overlay_interactV1_ = 0 );
effect_descriptor_props_.append( image_effect_prop_supports_multiresolution_ = 1 );
@@ -1215,8 +1215,8 @@
effect_descriptor_props_.append( image_effect_prop_field_render_twice_always_ = 0 );
effect_descriptor_props_.append( image_effect_prop_supports_multiple_clip_depths_ = 1 );
effect_descriptor_props_.append( image_effect_prop_supports_multiple_clip_pars_ = 1 );
- effect_descriptor_props_.append( image_effect_prop_clip_preferences_slave_param_ = "" );
- effect_descriptor_props_.append( image_effect_prop_file_path_ = "" );
+ effect_descriptor_props_.append( image_effect_prop_clip_preferences_slave_param_ = pl::string( "" ) );
+ effect_descriptor_props_.append( image_effect_prop_file_path_ = pl::string( "" ) );
}
// Effect descriptor properties.
@@ -1302,26 +1302,26 @@
private:
void set_clip_instance_properties( )
{
- clip_instance_props_.append( clip_instance_prop_type_ = kOfxTypeClip );
- clip_instance_props_.append( clip_instance_prop_name_ = "" );
- clip_instance_props_.append( clip_instance_prop_label_ = "" );
- clip_instance_props_.append( clip_instance_prop_short_label_ = "" );
- clip_instance_props_.append( clip_instance_prop_long_label_ = "" );
+ clip_instance_props_.append( clip_instance_prop_type_ = pl::string( kOfxTypeClip ) );
+ clip_instance_props_.append( clip_instance_prop_name_ = pl::string( "" ) );
+ clip_instance_props_.append( clip_instance_prop_label_ = pl::string( "" ) );
+ clip_instance_props_.append( clip_instance_prop_short_label_ = pl::string( "" ) );
+ clip_instance_props_.append( clip_instance_prop_long_label_ = pl::string( "" ) );
clip_instance_props_.append( clip_instance_prop_supported_components_ = string_vec( ) );
clip_instance_props_.append( clip_instance_prop_temporal_clip_access_ = 0 );
clip_instance_props_.append( clip_instance_prop_optional_ = 0 );
- clip_instance_props_.append( clip_instance_prop_field_extraction_ = kOfxImageFieldDoubled );
+ clip_instance_props_.append( clip_instance_prop_field_extraction_ = pl::string( kOfxImageFieldDoubled ) );
clip_instance_props_.append( clip_instance_prop_is_mask_ = 0 );
clip_instance_props_.append( clip_instance_prop_supports_tiles_ = 1 );
- clip_instance_props_.append( clip_instance_prop_pixel_depth_ = kOfxBitDepthNone );
- clip_instance_props_.append( clip_instance_prop_components_ = kOfxImageComponentNone );
- clip_instance_props_.append( clip_instance_prop_unmapped_pixel_depth_ = kOfxBitDepthNone );
- clip_instance_props_.append( clip_instance_prop_unmapped_components_ = kOfxImageComponentNone );
- clip_instance_props_.append( clip_instance_prop_premultiplication_ = kOfxImageOpaque );
+ clip_instance_props_.append( clip_instance_prop_pixel_depth_ = pl::string( kOfxBitDepthNone ) );
+ clip_instance_props_.append( clip_instance_prop_components_ = pl::string( kOfxImageComponentNone ) );
+ clip_instance_props_.append( clip_instance_prop_unmapped_pixel_depth_ = pl::string( kOfxBitDepthNone ) );
+ clip_instance_props_.append( clip_instance_prop_unmapped_components_ = pl::string( kOfxImageComponentNone ) );
+ clip_instance_props_.append( clip_instance_prop_premultiplication_ = pl::string( kOfxImageOpaque ) );
clip_instance_props_.append( clip_instance_prop_pixel_aspect_ratio_ = 0.0 );
clip_instance_props_.append( clip_instance_prop_frame_rate_ = 0.0 );
clip_instance_props_.append( clip_instance_prop_frame_range_ = double_vec( 2 ) );
- clip_instance_props_.append( clip_instance_prop_field_order_ = kOfxImageFieldNone );
+ clip_instance_props_.append( clip_instance_prop_field_order_ = pl::string( kOfxImageFieldNone ) );
clip_instance_props_.append( clip_instance_prop_connected_ = 0 );
clip_instance_props_.append( clip_instance_prop_unmapped_frame_range_ = double_vec( 2 ) );
clip_instance_props_.append( clip_instance_prop_unmapped_frame_rate_ = 0.0 );
@@ -1428,8 +1428,8 @@
private:
void set_image_effect_instance_properties( )
{
- effect_instance_props_.append( image_effect_instance_prop_type_ = kOfxTypeImageEffectInstance );
- effect_instance_props_.append( image_effect_instance_prop_context_ = kOfxImageEffectContextFilter );
+ effect_instance_props_.append( image_effect_instance_prop_type_ = pl::string( kOfxTypeImageEffectInstance ) );
+ effect_instance_props_.append( image_effect_instance_prop_context_ = pl::string( kOfxImageEffectContextFilter ) );
effect_instance_props_.append( image_effect_instance_prop_instance_data_ = static_cast<void*>( 0 ) );
effect_instance_props_.append( image_effect_instance_prop_project_size_ = double_vec( 2 ) );
effect_instance_props_.append( image_effect_instance_prop_project_offset_ = double_vec( 2 ) );
@@ -1564,7 +1564,7 @@
pcos::property_container render_in_args;
render_in_args.append( render_prop_time_ = 0.0 );
- render_in_args.append( render_prop_field_to_render_ = kOfxImageFieldNone );
+ render_in_args.append( render_prop_field_to_render_ = pl::string( kOfxImageFieldNone ) );
render_in_args.append( render_prop_render_window_ = render_win );
render_in_args.append( render_prop_render_scale_ = render_scale );
@@ -1616,16 +1616,16 @@
void set_host_parameters( )
{
- host_props_.append( host_prop_type_ = kOfxTypeImageEffectHost );
- host_props_.append( host_prop_name_ = "org.openlibraries.ofx_host" );
- host_props_.append( host_prop_label_ = "OpenLibraries OFX host" );
+ host_props_.append( host_prop_type_ = pl::string( kOfxTypeImageEffectHost ) );
+ host_props_.append( host_prop_name_ = pl::string( "org.openlibraries.ofx_host" ) );
+ host_props_.append( host_prop_label_ = pl::string( "OpenLibraries OFX host" ) );
host_props_.append( host_prop_is_background_ = 0 );
host_props_.append( host_prop_supports_overlays_ = 1 );
host_props_.append( host_prop_supports_multiresolution_ = 1 );
host_props_.append( host_prop_supports_tiles_ = 0 );
host_props_.append( host_prop_temporal_clip_access_ = 0 );
- host_props_.append( host_prop_supported_components_ = kOfxImageComponentRGBA );
- host_props_.append( host_prop_supported_contexts_ = kOfxImageEffectContextFilter );
+ host_props_.append( host_prop_supported_components_ = pl::string( kOfxImageComponentRGBA ) );
+ host_props_.append( host_prop_supported_contexts_ = pl::string( kOfxImageEffectContextFilter ) );
host_props_.append( host_prop_supports_multiple_clip_depths_ = 1 );
host_props_.append( host_prop_supports_multiple_clip_pars_ = 1 );
host_props_.append( host_prop_setable_frame_rate_ = 1 );
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
