[Jahshaka-cvs] jah/jahwidgets/src/qt3/widgets player.cpp, 1.31, 1.32
Status: Beta
Brought to you by:
jahshaka
From: Goncalo N. M. de C. <gl...@us...> - 2006-07-29 08:37:45
|
Update of /cvsroot/jahshaka/jah/jahwidgets/src/qt3/widgets In directory sc8-pr-cvs6.sourceforge.net:/tmp/cvs-serv5866/jahwidgets/src/qt3/widgets Modified Files: player.cpp Log Message: + histogram updates (py bindings calling the wrong member function) + recreated render_buffer every time a new texture is needed since a crash will occur if histogram is false and it hasnt been initialised Index: player.cpp =================================================================== RCS file: /cvsroot/jahshaka/jah/jahwidgets/src/qt3/widgets/player.cpp,v retrieving revision 1.31 retrieving revision 1.32 diff -u -d -r1.31 -r1.32 --- player.cpp 28 Jul 2006 19:51:33 -0000 1.31 +++ player.cpp 29 Jul 2006 08:37:41 -0000 1.32 @@ -697,8 +697,7 @@ media->phy_h( ) = phy_h; media->dirty( ) = false; - if( histogram( ) ) - rb_.init( "", phy_w, phy_h ); + rb_.init( "", phy_w, phy_h ); } else if ( media->dirty( ) ) { @@ -767,6 +766,7 @@ rb_.end_render_to( ); glViewport( 0, 0, width( ), height( ) ); + for( int i = 0; i < hist_.size( ); ++i ) { hist_.begin( i, target, rb_.get_GL_texture( ), phy_w, phy_h ); @@ -774,8 +774,6 @@ hist_.end( ); } - glViewport( 0, 0, width( ), height( ) ); - rb_.bind_as_GL_texture( ); draw_screen_quad_inverted( phy_w, phy_h, tex_w, tex_h ); rb_.unbind_as_GL_texture( ); |