encounter
/
SDL
mirror of https://github.com/encounter/SDL.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Android: Replaced logging tag strings with constant.

This commit is contained in:
Philipp Wiesemann 2015-05-16 21:15:59 +02:00
parent a54d038b64
commit f7ac02010f
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
android-project/src/org/libsdl/app/SDLActivity.java
View File

@ -114,9 +114,9 @@ public class SDLActivity extends Activity {
// Setup // Setup
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
Log.v("SDL", "Device: " + android.os.Build.DEVICE); Log.v(TAG, "Device: " + android.os.Build.DEVICE);
Log.v("SDL", "Model: " + android.os.Build.MODEL); Log.v(TAG, "Model: " + android.os.Build.MODEL);
Log.v("SDL", "onCreate():" + mSingleton); Log.v(TAG, "onCreate():" + mSingleton);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
SDLActivity.initialize(); SDLActivity.initialize();
@ -178,7 +178,7 @@ public class SDLActivity extends Activity {
// Events // Events
@Override @Override
protected void onPause() { protected void onPause() {
Log.v("SDL", "onPause()"); Log.v(TAG, "onPause()");
super.onPause(); super.onPause();
if (SDLActivity.mBrokenLibraries) { if (SDLActivity.mBrokenLibraries) {
@ -190,7 +190,7 @@ public class SDLActivity extends Activity {
@Override @Override
protected void onResume() { protected void onResume() {
Log.v("SDL", "onResume()"); Log.v(TAG, "onResume()");
super.onResume(); super.onResume();
if (SDLActivity.mBrokenLibraries) { if (SDLActivity.mBrokenLibraries) {
@ -204,7 +204,7 @@ public class SDLActivity extends Activity {
@Override @Override
public void onWindowFocusChanged(boolean hasFocus) { public void onWindowFocusChanged(boolean hasFocus) {
super.onWindowFocusChanged(hasFocus); super.onWindowFocusChanged(hasFocus);
Log.v("SDL", "onWindowFocusChanged(): " + hasFocus); Log.v(TAG, "onWindowFocusChanged(): " + hasFocus);
if (SDLActivity.mBrokenLibraries) { if (SDLActivity.mBrokenLibraries) {
return; return;
@ -218,7 +218,7 @@ public class SDLActivity extends Activity {
@Override @Override
public void onLowMemory() { public void onLowMemory() {
Log.v("SDL", "onLowMemory()"); Log.v(TAG, "onLowMemory()");
super.onLowMemory(); super.onLowMemory();
if (SDLActivity.mBrokenLibraries) { if (SDLActivity.mBrokenLibraries) {
@ -230,7 +230,7 @@ public class SDLActivity extends Activity {
@Override @Override
protected void onDestroy() { protected void onDestroy() {
Log.v("SDL", "onDestroy()"); Log.v(TAG, "onDestroy()");
if (SDLActivity.mBrokenLibraries) { if (SDLActivity.mBrokenLibraries) {
super.onDestroy(); super.onDestroy();
@ -248,11 +248,11 @@ public class SDLActivity extends Activity {
try { try {
SDLActivity.mSDLThread.join(); SDLActivity.mSDLThread.join();
} catch(Exception e) { } catch(Exception e) {
Log.v("SDL", "Problem stopping thread: " + e); Log.v(TAG, "Problem stopping thread: " + e);
} }
SDLActivity.mSDLThread = null; SDLActivity.mSDLThread = null;
//Log.v("SDL", "Finished waiting for SDL thread"); //Log.v(TAG, "Finished waiting for SDL thread");
} }
super.onDestroy(); super.onDestroy();
@ -542,7 +542,7 @@ public class SDLActivity extends Activity {
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") + " " + (sampleRate / 1000f) + "kHz, " + desiredFrames + " frames buffer"); Log.v(TAG, "SDL audio: wanted " + (isStereo ? "stereo" : "mono") + " " + (is16Bit ? "16-bit" : "8-bit") + " " + (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
@ -558,7 +558,7 @@ public class SDLActivity extends Activity {
// Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState() // Ref: http://developer.android.com/reference/android/media/AudioTrack.html#getState()
if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) { if (mAudioTrack.getState() != AudioTrack.STATE_INITIALIZED) {
Log.e("SDL", "Failed during initialization of Audio Track"); Log.e(TAG, "Failed during initialization of Audio Track");
mAudioTrack = null; mAudioTrack = null;
return -1; return -1;
} }
@ -566,7 +566,7 @@ public class SDLActivity extends Activity {
mAudioTrack.play(); mAudioTrack.play();
} }
Log.v("SDL", "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer"); Log.v(TAG, "SDL audio: got " + ((mAudioTrack.getChannelCount() >= 2) ? "stereo" : "mono") + " " + ((mAudioTrack.getAudioFormat() == AudioFormat.ENCODING_PCM_16BIT) ? "16-bit" : "8-bit") + " " + (mAudioTrack.getSampleRate() / 1000f) + "kHz, " + desiredFrames + " frames buffer");
return 0; return 0;
} }
@ -586,7 +586,7 @@ public class SDLActivity extends Activity {
// Nom nom // Nom nom
} }
} else { } else {
Log.w("SDL", "SDL audio: error return from write(short)"); Log.w(TAG, "SDL audio: error return from write(short)");
return; return;
} }
} }
@ -607,7 +607,7 @@ public class SDLActivity extends Activity {
// Nom nom // Nom nom
} }
} else { } else {
Log.w("SDL", "SDL audio: error return from write(byte)"); Log.w(TAG, "SDL audio: error return from write(byte)");
return; return;
} }
} }