summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/com/cooliris/media/Gallery.java21
-rw-r--r--src/com/cooliris/media/RenderView.java57
2 files changed, 60 insertions, 18 deletions
diff --git a/src/com/cooliris/media/Gallery.java b/src/com/cooliris/media/Gallery.java
index 7f6aebb..bfa2575 100644
--- a/src/com/cooliris/media/Gallery.java
+++ b/src/com/cooliris/media/Gallery.java
@@ -28,6 +28,7 @@ import android.content.Intent;
import android.content.res.Configuration;
import android.net.Uri;
import android.os.Bundle;
+import android.os.Environment;
import android.os.Handler;
import android.os.HandlerThread;
import android.os.Message;
@@ -81,7 +82,15 @@ public final class Gallery extends Activity {
mImageManagerHasStorageAfterDelay = ImageManager.hasStorage();
if (!mImageManagerHasStorageAfterDelay && mNumRetries < NUM_STORAGE_CHECKS) {
if (mNumRetries == 1) {
- mApp.showToast(getResources().getString(Res.string.no_sd_card), Toast.LENGTH_LONG);
+ int res;
+
+ if (Environment.isExternalStorageRemovable()) {
+ res = Res.string.no_sd_card;
+ } else {
+ res = Res.string.no_usb_storage;
+ }
+
+ mApp.showToast(getResources().getString(res), Toast.LENGTH_LONG);
}
handler.sendEmptyMessageDelayed(CHECK_STORAGE, 200);
} else {
@@ -103,7 +112,15 @@ public final class Gallery extends Activity {
}
if (isViewIntent() && getIntent().getData().equals(Images.Media.EXTERNAL_CONTENT_URI) && slideshowIntent) {
if (!imageManagerHasStorage) {
- Toast.makeText(this, getResources().getString(Res.string.no_sd_card), Toast.LENGTH_LONG).show();
+ int res;
+
+ if (Environment.isExternalStorageRemovable()) {
+ res = Res.string.no_sd_card;
+ } else {
+ res = Res.string.no_usb_storage;
+ }
+
+ Toast.makeText(this, getResources().getString(res), Toast.LENGTH_LONG).show();
finish();
} else {
Slideshow slideshow = new Slideshow(this);
diff --git a/src/com/cooliris/media/RenderView.java b/src/com/cooliris/media/RenderView.java
index 16011b2..0b76892 100644
--- a/src/com/cooliris/media/RenderView.java
+++ b/src/com/cooliris/media/RenderView.java
@@ -16,15 +16,6 @@
package com.cooliris.media;
-import java.lang.ref.ReferenceQueue;
-import java.lang.ref.WeakReference;
-import java.util.ArrayList;
-
-import javax.microedition.khronos.egl.EGLConfig;
-import javax.microedition.khronos.opengles.GL10;
-import javax.microedition.khronos.opengles.GL11;
-import javax.microedition.khronos.opengles.GL11Ext;
-
import android.content.Context;
import android.graphics.Bitmap;
import android.graphics.Canvas;
@@ -33,9 +24,9 @@ import android.hardware.Sensor;
import android.hardware.SensorEvent;
import android.hardware.SensorEventListener;
import android.hardware.SensorManager;
+import android.opengl.GLSurfaceView;
import android.opengl.GLU;
import android.opengl.GLUtils;
-import android.opengl.GLSurfaceView;
import android.os.Process;
import android.os.SystemClock;
import android.util.Log;
@@ -44,6 +35,15 @@ import android.view.KeyEvent;
import android.view.MotionEvent;
import android.view.SurfaceHolder;
+import java.lang.ref.ReferenceQueue;
+import java.lang.ref.WeakReference;
+import java.util.ArrayList;
+
+import javax.microedition.khronos.egl.EGLConfig;
+import javax.microedition.khronos.opengles.GL10;
+import javax.microedition.khronos.opengles.GL11;
+import javax.microedition.khronos.opengles.GL11Ext;
+
public final class RenderView extends GLSurfaceView implements GLSurfaceView.Renderer, SensorEventListener {
private static final String TAG = "RenderView";
private static final int NUM_TEXTURE_LOAD_THREADS = 4;
@@ -54,7 +54,7 @@ public final class RenderView extends GLSurfaceView implements GLSurfaceView.Ren
private static final int EVENT_KEY = 2;
private static final int EVENT_FOCUS = 3;
- private SensorManager mSensorManager;
+ private final SensorManager mSensorManager;
private GL11 mGL = null;
private int mViewWidth = 0;
@@ -331,7 +331,7 @@ public final class RenderView extends GLSurfaceView implements GLSurfaceView.Ren
// Allow the texture to defer queuing.
if (!texture.shouldQueue()) {
return;
- }
+ }
// Change the texture state to loading.
texture.mState = Texture.STATE_LOADING;
@@ -374,7 +374,7 @@ public final class RenderView extends GLSurfaceView implements GLSurfaceView.Ren
public void draw2D(Texture texture, int x, int y, int width, int height) {
if (bind(texture)) {
- ((GL11Ext) mGL).glDrawTexiOES(x, (int) (mViewHeight - y - height), 0, width, height);
+ ((GL11Ext) mGL).glDrawTexiOES(x, (mViewHeight - y - height), 0, width, height);
}
}
@@ -579,15 +579,33 @@ public final class RenderView extends GLSurfaceView implements GLSurfaceView.Ren
}
}
+ private final boolean ENABLE_FPS_TEST = false;
+ private int mFrameCount = 0;
+ private long mFrameCountingStart = 0;
+
/** Renders a frame of the UI. */
// @Override
public void onDrawFrame(GL10 gl1) {
+
+ if (ENABLE_FPS_TEST) {
+ long now = System.nanoTime();
+ if (mFrameCountingStart == 0) {
+ mFrameCountingStart = now;
+ } else if ((now - mFrameCountingStart) > 1000000000) {
+ Log.v(TAG, "fps: " + (double) mFrameCount
+ * 1000000000 / (now - mFrameCountingStart));
+ mFrameCountingStart = now;
+ mFrameCount = 0;
+ }
+ ++mFrameCount;
+ }
+
GL11 gl = (GL11) gl1;
if (!mFirstDraw) {
Log.i(TAG, "First Draw");
}
mFirstDraw = true;
- // setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
+ //setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
// Rebuild the display lists if the render tree has changed.
if (mListsDirty) {
updateLists();
@@ -816,7 +834,13 @@ public final class RenderView extends GLSurfaceView implements GLSurfaceView.Ren
Log.i(TAG, "GLObject has changed from " + mGL + " to " + gl);
mGL = gl;
}
- setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
+
+ if (ENABLE_FPS_TEST) {
+ setRenderMode(GLSurfaceView.RENDERMODE_CONTINUOUSLY);
+ } else {
+ setRenderMode(GLSurfaceView.RENDERMODE_WHEN_DIRTY);
+ }
+
// Increase the priority of the render thread.
// This is commented out to give other threads more CPU.
//Process.setThreadPriority(Process.THREAD_PRIORITY_DISPLAY);
@@ -921,7 +945,7 @@ public final class RenderView extends GLSurfaceView implements GLSurfaceView.Ren
// deadlocking with GLSurfaceView's needToWait().
/*
* if (mGL == null) { return; }
- *
+ *
* // Wait for the render thread to process this event. try {
* synchronized (this) { mCurrentFocusEventGain = gainFocus;
* mCurrentFocusEventDirection = direction; mCurrentEventType =
@@ -988,6 +1012,7 @@ public final class RenderView extends GLSurfaceView implements GLSurfaceView.Ren
super("TextureLoad");
}
+ @Override
public void run() {
Process.setThreadPriority(Process.THREAD_PRIORITY_BACKGROUND);
Deque<Texture> inputQueue = (sVideoTextureLoadThread == this) ? sLoadInputQueueVideo
generated by cgit v1.2.3 (git 2.25.1) at 2024-06-09 07:05:29 +0000