src/video/android/SDL_androidvideo.c
changeset 4980 d9fdff945ec9
parent 4963 604077962776
child 4981 55b82067815b
     1.1 --- a/src/video/android/SDL_androidvideo.c	Wed Jan 12 13:52:27 2011 -0800
     1.2 +++ b/src/video/android/SDL_androidvideo.c	Wed Jan 12 13:52:41 2011 -0800
     1.3 @@ -32,12 +32,12 @@
     1.4  
     1.5  #include "SDL_androidvideo.h"
     1.6  #include "SDL_androidevents.h"
     1.7 +#include "SDL_androidkeyboard.h"
     1.8  
     1.9  #define ANDROID_VID_DRIVER_NAME "Android"
    1.10  
    1.11  /* Initialization/Query functions */
    1.12  static int Android_VideoInit(_THIS);
    1.13 -static int Android_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode);
    1.14  static void Android_VideoQuit(_THIS);
    1.15  
    1.16  /* GL functions (SDL_androidgl.c) */
    1.17 @@ -93,9 +93,8 @@
    1.18      /* Set the function pointers */
    1.19      device->VideoInit = Android_VideoInit;
    1.20      device->VideoQuit = Android_VideoQuit;
    1.21 -    device->SetDisplayMode = Android_SetDisplayMode;
    1.22      device->PumpEvents = Android_PumpEvents;
    1.23 -   
    1.24 +
    1.25      device->free = Android_DeleteDevice;
    1.26  
    1.27      /* GL pointers */
    1.28 @@ -136,18 +135,12 @@
    1.29      SDL_zero(mode);
    1.30      SDL_AddDisplayMode(&_this->displays[0], &mode);
    1.31  
    1.32 -    Android_InitEvents();
    1.33 +    Android_InitKeyboard();
    1.34  
    1.35      /* We're done! */
    1.36      return 0;
    1.37  }
    1.38  
    1.39 -static int
    1.40 -Android_SetDisplayMode(_THIS, SDL_VideoDisplay * display, SDL_DisplayMode * mode)
    1.41 -{
    1.42 -    return 0;
    1.43 -}
    1.44 -
    1.45  void
    1.46  Android_VideoQuit(_THIS)
    1.47  {
    1.48 @@ -160,5 +153,4 @@
    1.49  }
    1.50  
    1.51  
    1.52 -
    1.53  /* vi: set ts=4 sw=4 expandtab: */