From: nathan.sweet <nathan.sweet@6c4fd544-2939-11df-bb46-9574ba5d0bfa>
Date: Tue, 25 Oct 2011 02:12:56 +0000 (+0000)
Subject: (no commit message)
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=72d6e6798c060eec460f9d31ba0a51495119e60d;p=mikumikustudio%2Flibgdx-mikumikustudio.git

---

diff --git a/backends/gdx-openal/src/com/badlogic/gdx/backends/openal/OpenALAudioDevice.java b/backends/gdx-openal/src/com/badlogic/gdx/backends/openal/OpenALAudioDevice.java
index c8f0b54ce..8c8036ec1 100644
--- a/backends/gdx-openal/src/com/badlogic/gdx/backends/openal/OpenALAudioDevice.java
+++ b/backends/gdx-openal/src/com/badlogic/gdx/backends/openal/OpenALAudioDevice.java
@@ -162,8 +162,8 @@ public class OpenALAudioDevice implements AudioDevice {
 		return renderedSeconds + alGetSourcef(sourceID, AL11.AL_SEC_OFFSET);
 	}
 
-	public void resetPosition () {
-		renderedSeconds = 0;
+	public void setPosition (float position) {
+		renderedSeconds = position;
 	}
 
 	public int getChannels () {
diff --git a/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/FlickScrollPane.java b/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/FlickScrollPane.java
index 5426a3928..9d657eed2 100644
--- a/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/FlickScrollPane.java
+++ b/gdx/src/com/badlogic/gdx/scenes/scene2d/ui/FlickScrollPane.java
@@ -42,7 +42,7 @@ public class FlickScrollPane extends WidgetGroup {
 
 	protected boolean scrollX, scrollY;
 	protected float amountX, amountY;
-	public float maxX, maxY;
+	protected float maxX, maxY;
 	protected float velocityX, velocityY;
 	protected float flingTimer;
 
@@ -290,6 +290,14 @@ public class FlickScrollPane extends WidgetGroup {
 		return amountY / maxY;
 	}
 
+	public float getMaxX () {
+		return maxX;
+	}
+	
+	public float getMaxY () {
+		return maxX;
+	}
+
 	/** Sets the {@link Actor} embedded in this scroll pane.
 	 * @param widget the Actor */
 	public void setWidget (Actor widget) {