From 4365c9b74bf137246aa171486f82fc748feb9b11 Mon Sep 17 00:00:00 2001
From: shagr4th <shagr4th@gmail.com>
Date: Fri, 25 Oct 2013 01:21:02 +0200
Subject: [PATCH] Temporary change

---
 AndroidManifest.xml        | 2 +-
 src/org/ab/x48/HPView.java | 6 ++++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 680bd3c..056d3c7 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-      package="org.ab.x48" android:installLocation="auto" android:versionCode="51" android:versionName="1.51">
+      package="org.ab.x48" android:installLocation="auto" android:versionCode="52" android:versionName="1.52">
     <application android:icon="@drawable/icon" android:label="@string/app_name">
         <activity android:name=".X48"
                   android:label="@string/app_name"
diff --git a/src/org/ab/x48/HPView.java b/src/org/ab/x48/HPView.java
index fb7cf0b..e63b89c 100644
--- a/src/org/ab/x48/HPView.java
+++ b/src/org/ab/x48/HPView.java
@@ -111,7 +111,7 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback, Runna
 		ann = new boolean [6];
 		buf = new short [(14+128)*262];
 		audiobuf = new short [44100]; // 1s worth
-		track = new AudioTrack(AudioManager.STREAM_MUSIC, 44100, AudioFormat.CHANNEL_CONFIGURATION_MONO, AudioFormat.ENCODING_PCM_16BIT, 16384, AudioTrack.MODE_STREAM);
+		track = new AudioTrack(AudioManager.STREAM_MUSIC, 44100, AudioFormat.CHANNEL_OUT_MONO, AudioFormat.ENCODING_PCM_16BIT, 16384, AudioTrack.MODE_STREAM);
 		annImages = new Bitmap [6];
 		updateContrast();
 		matrixScreen = new Matrix();
@@ -918,7 +918,9 @@ public class HPView extends SurfaceView implements SurfaceHolder.Callback, Runna
 						
 						
 						if (systemOptionDisplayed) {
-							c.drawText(x48.getString(R.string.show_menu), systemOptions_x, systemOptions_y, systemOptionsPaint);
+							// context.getString(R.string.show_menu) returns null on certains devices
+							// probably some resources are not yet loaded at this stage? for the time being... :
+							c.drawText("Touch the screen to show system options", systemOptions_x, systemOptions_y, systemOptionsPaint);
 						}