From: srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57>
Date: Mon, 7 Jul 2008 16:19:04 +0000 (+0000)
Subject: Try looking up multimedia controls under alternate names to potentially improve inter... 
X-Git-Url: http://git.rot13.org/?a=commitdiff_plain;h=1694b171aa46fd57991a992fee755dc27e2345a7;hp=146d09ea66f052e80dab8dc881da61375d5ada41;p=zxing.git

Try looking up multimedia controls under alternate names to potentially improve interoperability

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

diff --git a/javame/src/com/google/zxing/client/j2me/AdvancedMultimediaManager.java b/javame/src/com/google/zxing/client/j2me/AdvancedMultimediaManager.java
index 36573728..4de04cab 100644
--- a/javame/src/com/google/zxing/client/j2me/AdvancedMultimediaManager.java
+++ b/javame/src/com/google/zxing/client/j2me/AdvancedMultimediaManager.java
@@ -39,6 +39,9 @@ final class AdvancedMultimediaManager implements MultimediaManager {
   public void setFocus(Controllable player) {
     FocusControl focusControl = (FocusControl)
         player.getControl("javax.microedition.amms.control.camera.FocusControl");
+    if (focusControl == null) {
+      focusControl = (FocusControl) player.getControl("FocusControl");
+    }
     if (focusControl != null) {
       try {
         if (focusControl.isMacroSupported() && !focusControl.getMacro()) {
@@ -61,6 +64,9 @@ final class AdvancedMultimediaManager implements MultimediaManager {
 
   public void setZoom(Controllable player) {
     ZoomControl zoomControl = (ZoomControl) player.getControl("javax.microedition.amms.control.camera.ZoomControl");
+    if (zoomControl == null) {
+      zoomControl = (ZoomControl) player.getControl("ZoomControl");
+    }
     if (zoomControl != null) {
       // We zoom in if possible to encourage the viewer to take a snapshot from a greater distance.
       // This is a crude way of dealing with the fact that many phone cameras will not focus at a
@@ -80,6 +86,9 @@ final class AdvancedMultimediaManager implements MultimediaManager {
   public void setExposure(Controllable player) {
     ExposureControl exposureControl =
         (ExposureControl) player.getControl("javax.microedition.amms.control.camera.ExposureControl");
+    if (exposureControl == null) {
+      exposureControl = (ExposureControl) player.getControl("ExposureControl");
+    }
     if (exposureControl != null) {
 
       int[] supportedISOs = exposureControl.getSupportedISOs();