[Android] Rename load() function

[Jean-Baptiste Kempf]

vlc-ports/android | branch: master | Jean-Baptiste Kempf <jb at videolan.org> | Sat Apr 12 09:53:06 2014 +0200| [6390523cda1a4f35eebcf2ae73bbcbbaa2bc8eb5] | committer: Jean-Baptiste Kempf

Rename load() function

> http://git.videolan.org/gitweb.cgi/vlc-ports/android.git/?a=commit;h=6390523cda1a4f35eebcf2ae73bbcbbaa2bc8eb5
---

 .../src/org/videolan/vlc/gui/video/VideoPlayerActivity.java    |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
index 262f9d1..d332bcb 100644
--- a/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
+++ b/vlc-android/src/org/videolan/vlc/gui/video/VideoPlayerActivity.java
@@ -521,7 +521,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
     }
 
     private void startPlayback() {
-        load();
+        loadMedia();
 
         /*
          * if the activity has been paused by pressing the power button,
@@ -893,7 +893,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
             eventHandler.postDelayed(new Runnable() {
                 @Override
                 public void run() {
-                    load();
+                    loadMedia();
                 }
             }, 1000);
         } else {
@@ -933,7 +933,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
                 mPreviousHardwareAccelerationMode = mLibVLC.getHardwareAcceleration();
                 mLibVLC.setHardwareAcceleration(LibVLC.HW_ACCELERATION_DISABLED);
                 mSubtitlesSurface.setVisibility(View.INVISIBLE);
-                load();
+                loadMedia();
             }
         })
         .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() {
@@ -1714,7 +1714,7 @@ public class VideoPlayerActivity extends Activity implements IVideoPlayer {
      * - position (long) - position of the video to start with (in ms)
      */
     @SuppressWarnings({ "unchecked" })
-    private void load() {
+    private void loadMedia() {
         mLocation = null;
         String title = getResources().getString(R.string.title);
         boolean dontParse = false;