(no commit message)

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 c8f0b54..8c8036e 100644 (file)
--- 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);\r
        }\r
 \r
-       public void resetPosition () {\r
-               renderedSeconds = 0;\r
+       public void setPosition (float position) {\r
+               renderedSeconds = position;\r
        }\r
 \r
        public int getChannels () {\r

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 5426a39..9d657ee 100644 (file)
--- 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 {
 \r
        protected boolean scrollX, scrollY;\r
        protected float amountX, amountY;\r
-       public float maxX, maxY;\r
+       protected float maxX, maxY;\r
        protected float velocityX, velocityY;\r
        protected float flingTimer;\r
 \r
@@ -290,6 +290,14 @@ public class FlickScrollPane extends WidgetGroup {
                return amountY / maxY;\r
        }\r
 \r
+       public float getMaxX () {\r
+               return maxX;\r
+       }\r
+       \r
+       public float getMaxY () {\r
+               return maxX;\r
+       }\r
+\r
        /** Sets the {@link Actor} embedded in this scroll pane.\r
         * @param widget the Actor */\r
        public void setWidget (Actor widget) {\r