Update of /cvsroot/php-directfb/PHP-DirectFB/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv29001
Modified Files:
datatypes.c php_directfb.c
Log Message:
Added DFBScreenEncoderScanMode.
Fixed DFBScreenEncoderConfig (::$out_signals was missing).
Index: php_directfb.c
===================================================================
RCS file: /cvsroot/php-directfb/PHP-DirectFB/src/php_directfb.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -d -r1.5 -r1.6
--- php_directfb.c 15 Nov 2004 15:06:18 -0000 1.5
+++ php_directfb.c 18 Nov 2004 10:38:34 -0000 1.6
@@ -143,6 +143,8 @@
DIRECTFB_REGISTER_DEF( DSECAPS_TV_STANDARDS );
DIRECTFB_REGISTER_DEF( DSECAPS_TEST_PICTURE );
DIRECTFB_REGISTER_DEF( DSECAPS_MIXER_SEL );
+ DIRECTFB_REGISTER_DEF( DSECAPS_OUT_SIGNALS );
+ DIRECTFB_REGISTER_DEF( DSECAPS_SCANMODE );
/* DFBScreenEncoderType */
DIRECTFB_REGISTER_DEF( DSET_CRTC );
DIRECTFB_REGISTER_DEF( DSET_TV );
@@ -150,10 +152,15 @@
DIRECTFB_REGISTER_DEF( DSETV_PAL );
DIRECTFB_REGISTER_DEF( DSETV_NTSC );
DIRECTFB_REGISTER_DEF( DSETV_SECAM );
+ /* DFBScreenEncoderScanMode */
+ DIRECTFB_REGISTER_DEF( DSESM_INTERLACED );
+ DIRECTFB_REGISTER_DEF( DSESM_PROGRESSIVE );
/* DFBScreenEncoderConfigFlags */
DIRECTFB_REGISTER_DEF( DSECONF_TV_STANDARD );
DIRECTFB_REGISTER_DEF( DSECONF_TEST_PICTURE );
DIRECTFB_REGISTER_DEF( DSECONF_MIXER );
+ DIRECTFB_REGISTER_DEF( DSECONF_OUT_SIGNALS );
+ DIRECTFB_REGISTER_DEF( DSECONF_SCANMODE );
DIRECTFB_REGISTER_DEF( DSECONF_ALL );
/* DFBScreenEncoderTestPicture */
DIRECTFB_REGISTER_DEF( DSETP_OFF );
Index: datatypes.c
===================================================================
RCS file: /cvsroot/php-directfb/PHP-DirectFB/src/datatypes.c,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- datatypes.c 17 Nov 2004 17:04:25 -0000 1.4
+++ datatypes.c 18 Nov 2004 10:38:34 -0000 1.5
@@ -486,8 +486,9 @@
{
DFBScreenEncoderConfig config;
- if (zend_parse_parameters( ht, "llll", &config.flags, &config.tv_standard,
- &config.test_picture, &config.mixer ) != SUCCESS)
+ if (zend_parse_parameters( ht, "llllll", &config.flags, &config.tv_standard,
+ &config.test_picture, &config.mixer,
+ &config.out_signals, &config.scanmode ) != SUCCESS)
return false;
DFBScreenEncoderConfig_init( &config, this );
@@ -501,6 +502,8 @@
add_property_long( ret, "tv_standard", config->tv_standard );
add_property_long( ret, "test_picture", config->test_picture );
add_property_long( ret, "mixer", config->mixer );
+ add_property_long( ret, "out_signals", config->out_signals );
+ add_property_long( ret, "scanmode", config->scanmode );
}
void
@@ -518,6 +521,12 @@
if (ret->flags & DSECONF_MIXER)
GET_ENTRY_LONG( mixer, &ret->mixer );
+
+ if (ret->flags & DSECONF_OUT_SIGNALS)
+ GET_ENTRY_LONG( out_signals, &ret->out_signals );
+
+ if (ret->flags & DSECONF_SCANMODE)
+ GET_ENTRY_LONG( scanmode, &ret->scanmode );
}
DIRECTFB_DATATYPE_DEFINITION( DFBScreenEncoderConfig )
|
