Update of /cvsroot/playerstage/code/stage/src
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv9652/src
Modified Files:
Tag: release-2-0-patches
model_ptz.c p_driver.cc
Log Message:
fixed ptz and graphics2d behavior when gui_disable on
Index: p_driver.cc
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/p_driver.cc,v
retrieving revision 1.37
retrieving revision 1.37.2.1
diff -C2 -d -r1.37 -r1.37.2.1
*** p_driver.cc 29 Mar 2006 05:11:00 -0000 1.37
--- p_driver.cc 11 Dec 2007 23:32:16 -0000 1.37.2.1
***************
*** 299,302 ****
--- 299,304 ----
+ extern int _stg_disable_gui;
+
// Constructor. Retrieve options from the configuration file and do any
// pre-Setup() setup.
***************
*** 383,388 ****
case PLAYER_GRAPHICS2D_CODE:
! ifsrc = new InterfaceGraphics2d( player_addr, this, cf, section );
! break;
case PLAYER_GRIPPER_CODE:
--- 385,398 ----
case PLAYER_GRAPHICS2D_CODE:
! if(_stg_disable_gui)
! {
! PLAYER_WARN("Stage graphics2d interface disabled when not running
GUI");
! continue;
! }
! else
! {
! ifsrc = new InterfaceGraphics2d( player_addr, this, cf, section
);
! break;
! }
case PLAYER_GRIPPER_CODE:
Index: model_ptz.c
===================================================================
RCS file: /cvsroot/playerstage/code/stage/src/model_ptz.c,v
retrieving revision 1.2.2.1
retrieving revision 1.2.2.2
diff -C2 -d -r1.2.2.1 -r1.2.2.2
*** model_ptz.c 15 May 2007 00:09:59 -0000 1.2.2.1
--- model_ptz.c 11 Dec 2007 23:32:16 -0000 1.2.2.2
***************
*** 89,92 ****
--- 89,94 ----
int ptz_unrender_cfg( stg_model_t* mod, void* userp );
+ extern int _stg_disable_gui;
+
int ptz_init( stg_model_t* mod )
{
***************
*** 122,126 ****
stg_model_set_data( mod, &data, sizeof(data) );
! stg_model_add_callback( mod, &mod->data, ptz_render_data, NULL );
return 0; //ok
--- 124,129 ----
stg_model_set_data( mod, &data, sizeof(data) );
! if(!_stg_disable_gui)
! stg_model_add_callback( mod, &mod->data, ptz_render_data, NULL );
return 0; //ok
-------------------------------------------------------------------------
SF.Net email is sponsored by:
Check out the new SourceForge.net Marketplace.
It's the best place to buy or sell services for
just about anything Open Source.
http://sourceforge.net/services/buy/index.php
_______________________________________________
Playerstage-commit mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/playerstage-commit
