Mahtan/wagic
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

changed logging statements to debug instead of verbose. This should reduce the number of messages coming to the screen

Browse Source
This commit is contained in:
techdragon.nguyen@gmail.com
2012-04-17 04:16:15 +00:00
parent 8090d98dd0
commit 7711badc39
2 changed files with 32 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files
projects/mtg/Android/src/org/libsdl/app/SDLActivity.java
+23 -24
View File
@@ -465,7 +465,7 @@ public class SDLActivity extends Activity implements OnKeyListener{
@Override @Override
protected void onResume() { protected void onResume() {
Log.v("SDL", "onResume()"); //Log.v("SDL", "onResume()");
super.onResume(); super.onResume();
SDLActivity.nativeResume(); SDLActivity.nativeResume();
} }
@@ -473,7 +473,7 @@ public class SDLActivity extends Activity implements OnKeyListener{
@Override @Override
public void onDestroy() { public void onDestroy() {
Log.v("SDL", "onDestroy()"); //Log.v("SDL", "onDestroy()");
super.onDestroy(); super.onDestroy();
mSurface.onDestroy(); mSurface.onDestroy();
@@ -571,7 +571,7 @@ public class SDLActivity extends Activity implements OnKeyListener{
int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT; int audioFormat = is16Bit ? AudioFormat.ENCODING_PCM_16BIT : AudioFormat.ENCODING_PCM_8BIT;
int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1); int frameSize = (isStereo ? 2 : 1) * (is16Bit ? 2 : 1);
Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + ((float)sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer"); //Log.v("SDL", "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + ((float)sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer");
// Let the user pick a larger buffer if they really want -- but ye // Let the user pick a larger buffer if they really want -- but ye
// gods they probably shouldn't, the minimums are horrifyingly high // gods they probably shouldn't, the minimums are horrifyingly high
@@ -583,7 +583,7 @@ public class SDLActivity extends Activity implements OnKeyListener{
audioStartThread(); audioStartThread();
Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + ((float)mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer"); //Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + ((float)mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
if (is16Bit) { if (is16Bit) {
buf = new short[desiredFrames * (isStereo ? 2 : 1)]; buf = new short[desiredFrames * (isStereo ? 2 : 1)];
@@ -699,13 +699,12 @@ public class SDLActivity extends Activity implements OnKeyListener{
conexion.connect(); conexion.connect();
int lengthOfFile = conexion.getContentLength(); int lengthOfFile = conexion.getContentLength();
Log.d("Wagic - " + TAG1, " Length of file: " + lengthOfFile); //Log.d("Wagic - " + TAG1, " Length of file: " + lengthOfFile);
input = new BufferedInputStream(url.openStream()); input = new BufferedInputStream(url.openStream());
// create a File object for the output file // create a File object for the output file
File outputFile = new File(resDirectory, filename + ".tmp"); File outputFile = new File(resDirectory, filename + ".tmp");
output = new FileOutputStream(outputFile); output = new FileOutputStream(outputFile);
byte data[] = new byte[1024]; byte data[] = new byte[1024];
@@ -731,7 +730,7 @@ public class SDLActivity extends Activity implements OnKeyListener{
protected void onProgressUpdate(Integer... progress) { protected void onProgressUpdate(Integer... progress) {
if (progress[0] != mProgressDialog.getProgress()) if (progress[0] != mProgressDialog.getProgress())
{ {
Log.d("Wagic - " + TAG1, "current progress : " + progress[0]); //Log.d("Wagic - " + TAG1, "current progress : " + progress[0]);
mProgressDialog.setProgress(progress[0]); mProgressDialog.setProgress(progress[0]);
} }
} }
@@ -884,50 +883,50 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
// Called when the surface is resized // Called when the surface is resized
public void surfaceChanged(SurfaceHolder holder, public void surfaceChanged(SurfaceHolder holder,
int format, int width, int height) { int format, int width, int height) {
Log.v("SDL", "surfaceChanged()"); Log.d("SDL", "surfaceChanged()");
int sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565 by default int sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565 by default
switch (format) { switch (format) {
case PixelFormat.A_8: case PixelFormat.A_8:
Log.v("SDL", "pixel format A_8"); Log.d("SDL", "pixel format A_8");
break; break;
case PixelFormat.LA_88: case PixelFormat.LA_88:
Log.v("SDL", "pixel format LA_88"); Log.d("SDL", "pixel format LA_88");
break; break;
case PixelFormat.L_8: case PixelFormat.L_8:
Log.v("SDL", "pixel format L_8"); Log.d("SDL", "pixel format L_8");
break; break;
case PixelFormat.RGBA_4444: case PixelFormat.RGBA_4444:
Log.v("SDL", "pixel format RGBA_4444"); Log.d("SDL", "pixel format RGBA_4444");
sdlFormat = 0x85421002; // SDL_PIXELFORMAT_RGBA4444 sdlFormat = 0x85421002; // SDL_PIXELFORMAT_RGBA4444
break; break;
case PixelFormat.RGBA_5551: case PixelFormat.RGBA_5551:
Log.v("SDL", "pixel format RGBA_5551"); Log.d("SDL", "pixel format RGBA_5551");
sdlFormat = 0x85441002; // SDL_PIXELFORMAT_RGBA5551 sdlFormat = 0x85441002; // SDL_PIXELFORMAT_RGBA5551
break; break;
case PixelFormat.RGBA_8888: case PixelFormat.RGBA_8888:
Log.v("SDL", "pixel format RGBA_8888"); Log.d("SDL", "pixel format RGBA_8888");
sdlFormat = 0x86462004; // SDL_PIXELFORMAT_RGBA8888 sdlFormat = 0x86462004; // SDL_PIXELFORMAT_RGBA8888
break; break;
case PixelFormat.RGBX_8888: case PixelFormat.RGBX_8888:
Log.v("SDL", "pixel format RGBX_8888"); Log.d("SDL", "pixel format RGBX_8888");
sdlFormat = 0x86262004; // SDL_PIXELFORMAT_RGBX8888 sdlFormat = 0x86262004; // SDL_PIXELFORMAT_RGBX8888
break; break;
case PixelFormat.RGB_332: case PixelFormat.RGB_332:
Log.v("SDL", "pixel format RGB_332"); Log.d("SDL", "pixel format RGB_332");
sdlFormat = 0x84110801; // SDL_PIXELFORMAT_RGB332 sdlFormat = 0x84110801; // SDL_PIXELFORMAT_RGB332
break; break;
case PixelFormat.RGB_565: case PixelFormat.RGB_565:
Log.v("SDL", "pixel format RGB_565"); Log.d("SDL", "pixel format RGB_565");
sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565 sdlFormat = 0x85151002; // SDL_PIXELFORMAT_RGB565
break; break;
case PixelFormat.RGB_888: case PixelFormat.RGB_888:
Log.v("SDL", "pixel format RGB_888"); Log.d("SDL", "pixel format RGB_888");
// Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead? // Not sure this is right, maybe SDL_PIXELFORMAT_RGB24 instead?
sdlFormat = 0x86161804; // SDL_PIXELFORMAT_RGB888 sdlFormat = 0x86161804; // SDL_PIXELFORMAT_RGB888
break; break;
default: default:
Log.v("SDL", "pixel format unknown " + format); Log.d("SDL", "pixel format unknown " + format);
break; break;
} }
SDLActivity.onNativeResize(width, height, sdlFormat); SDLActivity.onNativeResize(width, height, sdlFormat);
@@ -942,7 +941,7 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
// EGL functions // EGL functions
public boolean initEGL(int majorVersion, int minorVersion) { public boolean initEGL(int majorVersion, int minorVersion) {
Log.v("SDL", "Starting up OpenGL ES " + majorVersion + "." + minorVersion); Log.d("SDL", "Starting up OpenGL ES " + majorVersion + "." + minorVersion);
try { try {
@@ -988,9 +987,9 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} }
} catch(Exception e) { } catch(Exception e) {
Log.v("SDL", e + ""); Log.e("SDL", e + "");
for (StackTraceElement s : e.getStackTrace()) { for (StackTraceElement s : e.getStackTrace()) {
Log.v("SDL", s.toString()); Log.e("SDL", s.toString());
} }
} }
@@ -1059,9 +1058,9 @@ class SDLSurface extends SurfaceView implements SurfaceHolder.Callback,
} catch(Exception e) { } catch(Exception e) {
Log.v("SDL", "flipEGL(): " + e); Log.e("SDL", "flipEGL(): " + e);
for (StackTraceElement s : e.getStackTrace()) { for (StackTraceElement s : e.getStackTrace()) {
Log.v("SDL", s.toString()); Log.e("SDL", s.toString());
} }
} }
projects/mtg/wagic.xcodeproj/project.pbxproj
+9 -5
View File
@@ -1978,7 +1978,7 @@
29B97313FDCFA39411CA2CEA /* Project object */ = { 29B97313FDCFA39411CA2CEA /* Project object */ = {
isa = PBXProject; isa = PBXProject;
attributes = { attributes = {
LastUpgradeCheck = 0420; LastUpgradeCheck = 0430;
}; };
buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "wagic" */; buildConfigurationList = C01FCF4E08A954540054247B /* Build configuration list for PBXProject "wagic" */;
compatibilityVersion = "Xcode 3.2"; compatibilityVersion = "Xcode 3.2";
@@ -2513,8 +2513,9 @@
FT2_BUILD_LIBRARY, FT2_BUILD_LIBRARY,
FORCE_GLES, FORCE_GLES,
); );
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv6]" = ""; "GCC_THUMB_SUPPORT[arch=armv6]" = "";
GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
../../JGE/include/, ../../JGE/include/,
include/, include/,
@@ -2560,8 +2561,9 @@
TESTSUITE, TESTSUITE,
FORCE_GLES, FORCE_GLES,
); );
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv6]" = ""; "GCC_THUMB_SUPPORT[arch=armv6]" = "";
GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
../../JGE/include/, ../../JGE/include/,
include/, include/,
@@ -2610,9 +2612,10 @@
DARWIN_NO_CARBON, DARWIN_NO_CARBON,
FT2_BUILD_LIBRARY, FT2_BUILD_LIBRARY,
); );
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv6]" = ""; "GCC_THUMB_SUPPORT[arch=armv6]" = "";
GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_PARAMETER = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (
@@ -2658,9 +2661,10 @@
FT2_BUILD_LIBRARY, FT2_BUILD_LIBRARY,
IOS, IOS,
); );
GCC_THUMB_SUPPORT = NO;
"GCC_THUMB_SUPPORT[arch=armv6]" = ""; "GCC_THUMB_SUPPORT[arch=armv6]" = "";
GCC_TREAT_WARNINGS_AS_ERRORS = NO; GCC_TREAT_WARNINGS_AS_ERRORS = NO;
GCC_VERSION = com.apple.compilers.llvmgcc42; GCC_VERSION = com.apple.compilers.llvm.clang.1_0;
GCC_WARN_SIGN_COMPARE = YES; GCC_WARN_SIGN_COMPARE = YES;
GCC_WARN_UNUSED_PARAMETER = NO; GCC_WARN_UNUSED_PARAMETER = NO;
HEADER_SEARCH_PATHS = ( HEADER_SEARCH_PATHS = (