From 3dd0ee91d054b612bbc4ced61acd378c78770bbf Mon Sep 17 00:00:00 2001
From: yabause <yabause@users.sf.net>
Date: Tue, 28 Apr 2009 19:48:48 +0000
Subject: [PATCH] Removed the frame limiter code based on SDL semaphore that
 was commented and unused.

---
 desmume/src/gtk-glade/desmume.cpp | 19 ------------
 desmume/src/gtk-glade/main.cpp    | 49 -------------------------------
 2 files changed, 68 deletions(-)

diff --git a/desmume/src/gtk-glade/desmume.cpp b/desmume/src/gtk-glade/desmume.cpp
index fcfb08aa4..03327e222 100755
--- a/desmume/src/gtk-glade/desmume.cpp
+++ b/desmume/src/gtk-glade/desmume.cpp
@@ -131,17 +131,8 @@ static void Draw()
 
 gboolean EmuLoop(gpointer data)
 {
-	/*
-	int i;
-	if (!noticed_3D) {
-		GtkWidget * dlg = glade_xml_get_widget(xml, "w3Dop");
-		gtk_widget_show(dlg);
-		noticed_3D=TRUE;
-	}*/
-		
 	if(desmume_running())	/* Si on est en train d'executer le programme ... */
 	{
-	 // static int limiter_frame_counter = 0;	
 		if(Frameskip == 0)
 			NDS_SkipFrame(false);
 		else
@@ -182,16 +173,6 @@ gboolean EmuLoop(gpointer data)
 		
 		ticksPrevFrame = SDL_GetTicks();
 
-             /*   if ( !glade_fps_limiter_disabled) {
-                  limiter_frame_counter += 1;
-                  if ( limiter_frame_counter >= FPS_LIMITER_FRAME_PERIOD) {
-                    limiter_frame_counter = 0;
-
-                    /* wait for the timer to expire *-/
-                    SDL_SemWait( glade_fps_limiter_semaphore);
-                  }
-                }*/
-
 		return TRUE;
 	}
 	gtk_widget_queue_draw(pDrawingArea);
diff --git a/desmume/src/gtk-glade/main.cpp b/desmume/src/gtk-glade/main.cpp
index 9aab0ec5f..485529e8a 100755
--- a/desmume/src/gtk-glade/main.cpp
+++ b/desmume/src/gtk-glade/main.cpp
@@ -38,10 +38,6 @@
 #include "gdk_3Demu.h"
 #endif
 
-/*
- * The frame limiter semaphore
- */
-//SDL_sem *glade_fps_limiter_semaphore;
 int glade_fps_limiter_disabled = 0;
 
 GtkWidget * pWindow;
@@ -426,28 +422,6 @@ joinThread_gdb( void *thread_handle) {
 #endif
 
 
-
-/** 
- * A SDL timer callback function. Signals the supplied SDL semaphore
- * if its value is small.
- * 
- * @param interval The interval since the last call (in ms)
- * @param param The pointer to the semaphore.
- * 
- * @return The interval to the next call (required by SDL)
- */
-/*static Uint32
-glade_fps_limiter_fn( Uint32 interval, void *param) {
-  SDL_sem *sdl_semaphore = (SDL_sem *)param;
-
-  /* signal the semaphore if it is getting low *-/
-  if ( SDL_SemValue( sdl_semaphore) < 4) {
-    SDL_SemPost( sdl_semaphore);
-  }
-
-  return interval;
-}*/
-
 /* ***** ***** MAIN ***** ***** */
 
 static int
@@ -606,33 +580,10 @@ common_gtk_glade_main( struct configured_features *my_config) {
         /* setup the frame limiter and indicate if it is disabled */
         glade_fps_limiter_disabled = my_config->disable_limiter;
 
-    /*    if ( !glade_fps_limiter_disabled) {
-          /* create the semaphore used for fps limiting *-/
-          glade_fps_limiter_semaphore = SDL_CreateSemaphore( 1);
-
-          /* start a SDL timer for every FPS_LIMITER_FRAME_PERIOD
-           * frames to keep us at 60 fps *-/
-          limiter_timer = SDL_AddTimer( 16 * FPS_LIMITER_FRAME_PERIOD,
-                                        glade_fps_limiter_fn,
-                                        glade_fps_limiter_semaphore);
-          if ( limiter_timer == NULL) {
-            fprintf( stderr, _("Error trying to start FPS limiter timer: %s\n"),
-                     SDL_GetError());
-            SDL_DestroySemaphore( glade_fps_limiter_semaphore);
-            glade_fps_limiter_disabled = 1;
-          }
-        }*/
-
 	/* start event loop */
 	gtk_main();
 	desmume_free();
 
-      /*  if ( !glade_fps_limiter_disabled) {
-          /* tidy up the FPS limiter timer and semaphore *-/
-          SDL_RemoveTimer( limiter_timer);
-          SDL_DestroySemaphore( glade_fps_limiter_semaphore);
-        }*/
-
         /* Unload joystick */
         uninit_joy();