Changeset 3238 in orxonox.OLD for orxonox/branches/sound/src/keynames.h

Timestamp:

Dec 20, 2004, 2:42:54 AM (21 years ago)

Author:

bensch

Message:

orxonox/branches: updated branches: buerli, nico, sound. And moved bezierTrack to old.bezierTrack. Conflicts resolved in a usefull order.
Conflics mostly resolved in favor of trunk
merge.

File:

• orxonox/branches/sound/src/keynames.h (modified) (6 diffs)

orxonox/branches/sound/src/keynames.h

@@ -5 +5 @@
                 Converts strings to SDLK/SDL_BUTTON values and vice versa
 */
+#ifndef _KEYNAMES_H
+#define _KEYNAMES_H
+
 
 #ifdef __WIN32__
@@ -10 +13 @@
 #endif
 
+#ifndef __APPLE__
 #include <SDL/SDL.h>
+#else
+#include <SDL.h>
+#endif
 
 /**
@@ -17 +24 @@
         \return an int containing the SDL identifier of the mouse button or -1 if the button name is not valid
 */
-int buttonname_to_SDLB( char* name);
+int buttonnameToSDLB( char* name);
 
 /**
@@ -24 +31 @@
         \return a pointer to a string containing the name of the mouse button
 */
-char* SDLB_to_buttonname( int button);
+char* SDLBToButtonname( int button);
 
 /**
@@ -31 +38 @@
         \return the SDLK sym of the named key or -1 if the key name is not valid
 */
-int keyname_to_SDLK( char* name);
+int keynameToSDLK( char* name);
 
 /**
@@ -38 +45 @@
         \return a pointer to a string containig the name of the key
 */
-char* SDLK_to_keyname( int key);
+char* SDLKToKeyname( int key);
 
+
+#endif /* _KEYNAMES_H */