diff options
Diffstat (limited to 'olpcgames/video.py')
| -rw-r--r--[-rwxr-xr-x] | olpcgames/video.py | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/olpcgames/video.py b/olpcgames/video.py index 032aa13..8d13794 100755..100644 --- a/olpcgames/video.py +++ b/olpcgames/video.py @@ -8,12 +8,8 @@ import logging log = logging.getLogger( 'olpcgames.video' ) #log.setLevel( logging.INFO ) import os -import signal import pygame -import weakref import olpcgames -from olpcgames import _gtkmain - import pygtk pygtk.require('2.0') import gtk @@ -82,7 +78,7 @@ class PygameWidget( object ): def __init__( self ): try: window_id = pygame.display.get_wm_info()['window'] - except KeyError, err: # pygame-ctypes... + except KeyError: # pygame-ctypes... window_id = int(os.environ['SDL_WINDOWID']) self.window_id = window_id self._imagesink = None @@ -147,14 +143,13 @@ if __name__ == "__main__": # Simple testing code... logging.basicConfig() log.setLevel( logging.DEBUG ) - from pygame import image,display, event - import pygame + def main(): - display.init() - maxX,maxY = display.list_modes()[0] - screen = display.set_mode( (maxX/3, maxY/3 ) ) + pygame.display.init() + maxX,maxY = pygame.display.list_modes()[0] + pygame.display.set_mode( (maxX/3, maxY/3 ) ) - display.flip() + pygame.display.flip() pgw = PygameWidget( ) p = Player( pgw, pipe_desc=Player.test_pipe_desc ) |