[Scummvm-cvs-logs] SF.net SVN: scummvm:[41167] scummvm/trunk/backends/platform/gp2xwiz

[fingolfin at users.sourceforge.net]

Revision: 41167
          http://scummvm.svn.sourceforge.net/scummvm/?rev=41167&view=rev
Author:   fingolfin
Date:     2009-06-04 11:45:34 +0000 (Thu, 04 Jun 2009)

Log Message:
-----------
Code formatting in the gp2xwiz backend

Modified Paths:
--------------
    scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp
    scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
    scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-main.cpp

Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp	2009-06-04 11:45:17 UTC (rev 41166)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-events.cpp	2009-06-04 11:45:34 UTC (rev 41167)
@@ -95,39 +95,37 @@
 	if ((stickBtn[0])||(stickBtn[2])||(stickBtn[4])||(stickBtn[6]))
 		stickBtn[1] = stickBtn[3] = stickBtn[5] = stickBtn[7] = 0;
 
-	if ((stickBtn[1])||(stickBtn[2])||(stickBtn[3])){
-		if (_km.x_down_count!=2){
+	if ((stickBtn[1])||(stickBtn[2])||(stickBtn[3])) {
+		if (_km.x_down_count!=2) {
 			_km.x_vel = -1;
 			_km.x_down_count = 1;
-		}else
+		} else
 			_km.x_vel = -4;
-	} else if ((stickBtn[5])||(stickBtn[6])||(stickBtn[7])){
-		if (_km.x_down_count!=2){
+	} else if ((stickBtn[5])||(stickBtn[6])||(stickBtn[7])) {
+		if (_km.x_down_count!=2) {
 			_km.x_vel = 1;
 			_km.x_down_count = 1;
-		}else
+		} else
 			_km.x_vel = 4;
-	}
-	 else{
+	} else {
 		_km.x_vel = 0;
 		_km.x_down_count = 0;
 	}
 
 
-	if ((stickBtn[0])||(stickBtn[1])||(stickBtn[7])){
-		if (_km.y_down_count!=2){
+	if ((stickBtn[0])||(stickBtn[1])||(stickBtn[7])) {
+		if (_km.y_down_count!=2) {
 			_km.y_vel = -1;
 			_km.y_down_count = 1;
-		}else
+		} else
 			_km.y_vel = -4;
-	} else if ((stickBtn[3])||(stickBtn[4])||(stickBtn[5])){
-		if (_km.y_down_count!=2){
+	} else if ((stickBtn[3])||(stickBtn[4])||(stickBtn[5])) {
+		if (_km.y_down_count!=2) {
 			_km.y_vel = 1;
 			_km.y_down_count = 1;
-		}else
+		} else
 			_km.y_vel = 4;
-	}
-	 else{
+	} else {
 		_km.y_vel = 0;
 		_km.y_down_count = 0;
 	}

Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp	2009-06-04 11:45:17 UTC (rev 41166)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-hw.cpp	2009-06-04 11:45:34 UTC (rev 41167)
@@ -50,26 +50,21 @@
 void deviceDeinit() {
 }
 
-void mixerMoveVolume( int direction )
-{
-    if( volumeLevel <= 10 )
-    {
-        if( direction == VOLUME_UP )   volumeLevel += VOLUME_CHANGE_RATE/2;
-        if( direction == VOLUME_DOWN ) volumeLevel -= VOLUME_CHANGE_RATE/2;
+void mixerMoveVolume(int direction) {
+    if (volumeLevel <= 10) {
+        if (direction == VOLUME_UP)   volumeLevel += VOLUME_CHANGE_RATE/2;
+        if (direction == VOLUME_DOWN) volumeLevel -= VOLUME_CHANGE_RATE/2;
+    } else {
+        if(direction == VOLUME_UP)   volumeLevel += VOLUME_CHANGE_RATE;
+        if(direction == VOLUME_DOWN) volumeLevel -= VOLUME_CHANGE_RATE;
     }
-    else
-    {
-        if( direction == VOLUME_UP )   volumeLevel += VOLUME_CHANGE_RATE;
-        if( direction == VOLUME_DOWN ) volumeLevel -= VOLUME_CHANGE_RATE;
-    }
 
-    if( volumeLevel < VOLUME_MIN ) volumeLevel = VOLUME_MIN;
-    if( volumeLevel > VOLUME_MAX ) volumeLevel = VOLUME_MAX;
+    if (volumeLevel < VOLUME_MIN) volumeLevel = VOLUME_MIN;
+    if (volumeLevel > VOLUME_MAX) volumeLevel = VOLUME_MAX;
 
     unsigned long soundDev = open("/dev/mixer", O_RDWR);
 
-    if(soundDev)
-    {
+    if(soundDev) {
         int vol = ((volumeLevel << 8) | volumeLevel);
         ioctl(soundDev, SOUND_MIXER_WRITE_PCM, &vol);
         close(soundDev);

Modified: scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-main.cpp
===================================================================
--- scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-main.cpp	2009-06-04 11:45:17 UTC (rev 41166)
+++ scummvm/trunk/backends/platform/gp2xwiz/gp2xwiz-main.cpp	2009-06-04 11:45:34 UTC (rev 41167)
@@ -23,7 +23,7 @@
  *
  */
 
-#include <common/scummsys.h>
+#include "common/scummsys.h"
 #include <SDL/SDL.h>
 
 #include "backends/platform/gp2xwiz/gp2xwiz-sdl.h"


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.