Improve handling of MultimediaManager to make it a bit easier to make a 'basic' build

git-svn-id: http://zxing.googlecode.com/svn/trunk@822 59b500cc-1b3d-0410-9834-0bbf25fbcc57

diff --git a/javame/src/com/google/zxing/client/j2me/SnapshotThread.java b/javame/src/com/google/zxing/client/j2me/SnapshotThread.java
index 7ad5b19..3411222 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/SnapshotThread.java
+++ b/javame/src/com/google/zxing/client/j2me/SnapshotThread.java
@@ -43,7 +43,7 @@ final class SnapshotThread implements Runnable {
     this.zXingMIDlet = zXingMIDlet;
     waitLock = new Object();
     done = false;
-    multimediaManager = new DefaultMultimediaManager();
+    multimediaManager = ZXingMIDlet.buildMultimediaManager();
   }
 
   void continueRun() {

diff --git a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
index b4ebb8e..7e8c2bc 100644 (file)
--- a/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
+++ b/javame/src/com/google/zxing/client/j2me/ZXingMIDlet.java
@@ -67,13 +67,17 @@ public final class ZXingMIDlet extends MIDlet {
     return videoControl;
   }
 
+  static MultimediaManager buildMultimediaManager() {
+    return new AdvancedMultimediaManager();
+    // Comment line above / uncomment below to make the basic version
+    // return new DefaultMultimediaManager();
+  }
+
   protected void startApp() throws MIDletStateChangeException {
     try {
       player = createPlayer();
       player.realize();
-      MultimediaManager multimediaManager = new AdvancedMultimediaManager();
-      // Comment line above / uncomment below to make the basic version
-      //MultimediaManager multimediaManager = new DefaultMultimediaManager();
+      MultimediaManager multimediaManager = buildMultimediaManager();
       multimediaManager.setZoom(player);
       multimediaManager.setExposure(player);
       videoControl = (VideoControl) player.getControl("VideoControl");