upgrading SDL->projectM keydown handler updated for SDL2

Author: revmischa

src/libprojectM/sdltoprojectM.h

@@ -41,13 +41,13 @@
 #ifdef WIN32
 #include <SDL.h>
 #else
-#include <SDL/SDL.h>
+#include <SDL2/SDL.h>
 #endif
 
-inline projectMEvent sdl2pmEvent( SDL_Event event ) { \
+inline projectMEvent sdl2pmEvent( SDL_Event *event ) { \
 
-    switch ( event.type ) { \
-        case SDL_VIDEORESIZE:
+    switch ( event->type ) { \
+        case SDL_WINDOWEVENT_RESIZED:
             return PROJECTM_VIDEORESIZE; \
         case SDL_KEYUP: \
             return PROJECTM_KEYUP; \
@@ -58,8 +58,8 @@ inline projectMEvent sdl2pmEvent( SDL_Event event ) { \
       } \
   } \
 
-inline projectMKeycode sdl2pmKeycode( SDLKey keysym ) { \
-    switch ( keysym ) { \
+inline projectMKeycode sdl2pmKeycode( SDL_Keysym keysym ) { \
+    switch ( keysym.sym ) { \
         case SDLK_F1: \
             return PROJECTM_K_F1; \
         case SDLK_F2: \
@@ -158,7 +158,7 @@ inline projectMKeycode sdl2pmKeycode( SDLKey keysym ) { \
       } \
   } \
 
-inline projectMModifier sdl2pmModifier( SDLMod mod ) { \
+inline projectMModifier sdl2pmModifier( SDL_Keymod mod ) { \
     return PROJECTM_KMOD_LSHIFT; \
   } \
 

src/projectM-sdl/projectM_SDL_main.cpp

@@ -25,6 +25,7 @@
 #endif
 
 #include <projectM.hpp>
+#include <sdltoprojectM.h>
 #include <iostream>
 const float FPS = 60;
 
@@ -57,6 +58,22 @@ int selectAudioInput(projectMApp *app) {
     return 1;
 }
 
+void keyHandler(projectMApp *app, SDL_Event *sdl_evt) {
+    projectMEvent evt;
+    projectMKeycode key;
+    projectMModifier mod;
+    SDL_Keymod sdl_mod;
+
+    /** Translate into projectM codes and process */
+    evt = sdl2pmEvent(sdl_evt);
+    key = sdl2pmKeycode(sdl_evt->key.keysym);
+    sdl_mod = SDL_GetModState();
+    mod = sdl2pmModifier(sdl_mod);
+    if (evt == PROJECTM_KEYDOWN) {
+        app->pm->key_handler( evt, key, mod );
+    }
+}
+
 void renderFrame(projectMApp *app) {
     int i;
     short pcm_data[2][512];
@@ -65,30 +82,13 @@ void renderFrame(projectMApp *app) {
     SDL_PollEvent(&evt);
     switch (evt.type) {
         case SDL_KEYDOWN:
-            // ...
+            keyHandler(app, &evt);
             break;
         case SDL_QUIT:
             app->done = true;
             break;
     }
 
-
-//        projectMEvent evt;
-//        projectMKeycode key;
-//        projectMModifier mod;
-//
-//        /** Process SDL events */
-//        SDL_Event event;
-//        while ( SDL_PollEvent( &event ) ) {
-//            /** Translate into projectM codes and process */
-//            evt = sdl2pmEvent( event );
-//            key = sdl2pmKeycode( event.key.keysym.sym );
-//            mod = sdl2pmModifier( (SDLMod)event.key.keysym.mod );
-//            if ( evt == PROJECTM_KEYDOWN ) {
-//                pm->key_handler( evt, key, mod );
-//              }
-//          }
-
     /** Produce some fake PCM data to stuff into projectM */
     for ( i = 0 ; i < 512 ; i++ ) {
         if ( i % 2 == 0 ) {
@@ -107,7 +107,7 @@ void renderFrame(projectMApp *app) {
     /** Add the waveform data */
     app->pm->pcm()->addPCM16(pcm_data);
 
-    glClearColor( 0.0, 0.5, 0.0, 0.0 );
+    glClearColor( 0.0, 0.0, 0.0, 0.0 );
     glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
 
     app->pm->renderFrame();