[Enigma-cvs] enigma/src video.cc,1.12,1.13

[Daniel Heck <address@hidden>]

Update of /cvsroot/enigma/enigma/src
In directory subversions:/tmp/cvs-serv17546/src

Modified Files:
        video.cc 
Log Message:
Use new options:: code.


Index: video.cc
===================================================================
RCS file: /cvsroot/enigma/enigma/src/video.cc,v
retrieving revision 1.12
retrieving revision 1.13
diff -C2 -d -r1.12 -r1.13
*** video.cc    9 Nov 2003 11:53:36 -0000       1.12
--- video.cc    16 Nov 2003 19:30:49 -0000      1.13
***************
*** 98,104 ****
  }
  
! //----------------------------------------
! // Video engine impl
! //----------------------------------------
  Video_SDL::Video_SDL()
  : sdlScreen(0)
--- 98,104 ----
  }
  
! 
! /* -------------------- Vide Engine -------------------- */
! 
  Video_SDL::Video_SDL()
  : sdlScreen(0)
***************
*** 128,147 ****
          SDL_WM_SetIcon(icn->get_surface(), NULL);
  
!     int bpp = options::BitsPerPixel;
      assert(bpp==16 || bpp==32);
  
      Uint32 flags = SDL_SWSURFACE;
!     if (options::FullScreen)
          flags |= SDL_FULLSCREEN;
  
      sdlScreen = SDL_SetVideoMode(w, h, bpp, flags);
      if (sdlScreen == 0) {
!       fprintf(stderr, "Couldn't open screen: %s\n", SDL_GetError());
!         exit(1);
      }
  
      if (sdlScreen->flags & SDL_FULLSCREEN) {
          fullScreen = true;
-         options::FullScreen = true;
      }
      screen = new Screen(sdlScreen);
--- 128,150 ----
          SDL_WM_SetIcon(icn->get_surface(), NULL);
  
!     int bpp = 16; //options::BitsPerPixel;
      assert(bpp==16 || bpp==32);
  
      Uint32 flags = SDL_SWSURFACE;
!     if (options::GetBool("FullScreen"))
          flags |= SDL_FULLSCREEN;
  
      sdlScreen = SDL_SetVideoMode(w, h, bpp, flags);
      if (sdlScreen == 0) {
!         // Video mode not available? Try a fail-safe one
!         sdlScreen = SDL_SetVideoMode (640, 480, bpp, SDL_SWSURFACE);
!         if (sdlScreen == 0) {
!             fprintf(stderr, "Couldn't open screen: %s\n", SDL_GetError());
!             exit(1);
!         }
      }
  
      if (sdlScreen->flags & SDL_FULLSCREEN) {
          fullScreen = true;
      }
      screen = new Screen(sdlScreen);
***************
*** 342,346 ****
      assert (NUMENTRIES(video_modes) == VM_COUNT);
  
!     int vidmode = Clamp (options::VideoMode, 0, VM_COUNT-1);
      VMInfo &vminfo = video_modes[vidmode];
  
--- 345,349 ----
      assert (NUMENTRIES(video_modes) == VM_COUNT);
  
!     int vidmode = Clamp (options::GetInt("VideoMode"), 0, VM_COUNT-1);
      VMInfo &vminfo = video_modes[vidmode];
  
***************
*** 355,359 ****
      SDL_SetEventFilter(event_filter);
  
!     options::FullScreen = video_engine->is_fullscreen();
  }
  
--- 358,362 ----
      SDL_SetEventFilter(event_filter);
  
!     options::SetOption("FullScreen", video_engine->is_fullscreen());
  }
  
***************
*** 370,374 ****
  bool video::ToggleFullscreen() {
      video_engine->toggle_fullscreen();
!     return options::FullScreen = video_engine->is_fullscreen();
  }
  
--- 373,379 ----
  bool video::ToggleFullscreen() {
      video_engine->toggle_fullscreen();
!     bool is_fullscreen = video_engine->is_fullscreen();
!     options::SetOption("FullScreen", is_fullscreen);
!     return is_fullscreen;
  }