From: Shamus Hammons <jlhamm@acm.org>
Date: Sat, 20 Mar 2004 19:19:33 +0000 (+0000)
Subject: Moved SDL initialization to vj.cpp
X-Git-Tag: 1.0.7~51
X-Git-Url: http://shamusworld.gotdns.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=cea0a9b46b737322c3518a2bd0122d9a268574a8;p=virtualjaguar

Moved SDL initialization to vj.cpp
---

diff --git a/src/video.cpp b/src/video.cpp
index ffeee21..4600375 100644
--- a/src/video.cpp
+++ b/src/video.cpp
@@ -4,7 +4,6 @@
 // by James L. Hammons
 //
 
-#include "types.h"
 #include "tom.h"
 #include "sdlemu_opengl.h"
 #include "settings.h"
@@ -20,17 +19,10 @@ int16 * backbuffer;
 SDL_Joystick * joystick;
 
 //
-// Prime SDL and create surfaces
+// Create SDL/OpenGL surfaces
 //
 bool InitVideo(void)
 {
-	// Set up SDL library
-	if (SDL_Init(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER | SDL_INIT_NOPARACHUTE) < 0)
-	{
-		WriteLog("VJ: Could not initialize the SDL library: %s", SDL_GetError());
-		return false;
-	}
-
 	// Get proper info about the platform we're running on...
 	const SDL_VideoInfo * info = SDL_GetVideoInfo();
 
@@ -124,9 +116,6 @@ void VideoDone(void)
 
 	SDL_JoystickClose(joystick);
 	SDL_FreeSurface(surface);
-	SDL_QuitSubSystem(SDL_INIT_VIDEO | SDL_INIT_JOYSTICK | SDL_INIT_AUDIO | SDL_INIT_TIMER);
-	SDL_Quit();
-
 	free(backbuffer);
 }