From ab5f7bd39afad2842a74b8c760b8cef47901d6dc Mon Sep 17 00:00:00 2001
From: James Sanford <jsanford@froop.com>
Date: Mon, 1 Oct 2012 19:25:40 -0700
Subject: [PATCH] Shuffle more into BitmapThread.

---
 src/com/froop/app/kegs/BitmapThread.java | 7 +++----
 src/com/froop/app/kegs/KegsView.java     | 7 ++-----
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/src/com/froop/app/kegs/BitmapThread.java b/src/com/froop/app/kegs/BitmapThread.java
index 0604b19..42fb984 100644
--- a/src/com/froop/app/kegs/BitmapThread.java
+++ b/src/com/froop/app/kegs/BitmapThread.java
@@ -11,15 +11,15 @@ import android.view.SurfaceHolder;
 import java.util.concurrent.locks.ReentrantLock;
 
 class BitmapThread extends Thread {
-  public Handler mHandler = new Handler() {
+  private Handler mHandler = new Handler() {
     public void handleMessage(Message msg) {
       updateScreen();
     }
   };
 
   private SurfaceHolder mSurfaceHolder;
+  private final ReentrantLock mSurfaceLock = new ReentrantLock();
   private Bitmap mBitmap;
-  private ReentrantLock mSurfaceLock;
   private Canvas mCanvas;
   private boolean mHaveSurface = false;
   private boolean mScaled = false;
@@ -30,10 +30,9 @@ class BitmapThread extends Thread {
 
   private FpsCounter fpsCount = new FpsCounter("kegs", "thread");
 
-  public void setBitmap(SurfaceHolder surfaceHolder, Bitmap bitmap, ReentrantLock surfaceLock) {
+  public void setBitmap(SurfaceHolder surfaceHolder, Bitmap bitmap) {
     mSurfaceHolder = surfaceHolder;
     mBitmap = bitmap;
-    mSurfaceLock = surfaceLock;
   }
 
   public void run() {
diff --git a/src/com/froop/app/kegs/KegsView.java b/src/com/froop/app/kegs/KegsView.java
index 61d7fa6..a4f6ebc 100644
--- a/src/com/froop/app/kegs/KegsView.java
+++ b/src/com/froop/app/kegs/KegsView.java
@@ -29,7 +29,7 @@ class KegsView extends SurfaceView implements SurfaceHolder.Callback {
 
   protected ConcurrentLinkedQueue<Event.KegsEvent> mEventQueue = new ConcurrentLinkedQueue<Event.KegsEvent>();
 
-  private BitmapThread mBitmapThread;
+  private final BitmapThread mBitmapThread = new BitmapThread();
 
   class KegsThread extends Thread {
     private Handler mHandler;
@@ -37,7 +37,6 @@ class KegsView extends SurfaceView implements SurfaceHolder.Callback {
     private Canvas mCanvas;
     private SurfaceHolder mSurfaceHolder;
     private Context mContext;
-    private final ReentrantLock mSurfaceLock = new ReentrantLock();
     private final ReentrantLock mPauseLock = new ReentrantLock();
 
     public KegsThread(SurfaceHolder surfaceHolder, Context context) {
@@ -49,10 +48,8 @@ class KegsView extends SurfaceView implements SurfaceHolder.Callback {
                                     Bitmap.Config.ARGB_8888);
       mBitmap.setHasAlpha(false);
 
-      mBitmapThread = new BitmapThread();
+      mBitmapThread.setBitmap(surfaceHolder, mBitmap);
       mHandler = mBitmapThread.getHandler();
-
-      mBitmapThread.setBitmap(surfaceHolder, mBitmap, mSurfaceLock);
     }
 
     private FpsCounter fpsCount = new FpsCounter("kegs", "native");