[Android] Audio player: rename the AudioListAdapter

Adrien Maglo git at videolan.org
Fri Jan 31 10:33:51 CET 2014


vlc-ports/android | branch: master | Adrien Maglo <magsoft at videolan.org> | Fri Jan 31 10:33:44 2014 +0100| [0e923ebd7fa8c208d637eefdeb6dd88b45097628] | committer: Adrien Maglo

Audio player: rename the AudioListAdapter

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

 vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java      |    4 ++--
 .../audio/{AudioListAdapter.java => AudioPlaylistAdapter.java}   |    4 ++--
 .../src/org/videolan/vlc/gui/audio/AudioPlaylistView.java        |    6 +++---
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
index 8da986f..8d9dc7b 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlayer.java
@@ -86,7 +86,7 @@ public class AudioPlayer extends Fragment implements IAudioPlayer {
     private AudioServiceController mAudioController;
     private boolean mShowRemainingTime = false;
 
-    private AudioListAdapter mSongsListAdapter;
+    private AudioPlaylistAdapter mSongsListAdapter;
 
     private boolean mAdvFuncVisible;
     private boolean mPlaylistSwitchVisible;
@@ -100,7 +100,7 @@ public class AudioPlayer extends Fragment implements IAudioPlayer {
 
         mAudioController = AudioServiceController.getInstance();
 
-        mSongsListAdapter = new AudioListAdapter(getActivity());
+        mSongsListAdapter = new AudioPlaylistAdapter(getActivity());
     }
 
     @Override
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioListAdapter.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlaylistAdapter.java
similarity index 98%
rename from vlc-android/src/org/videolan/vlc/gui/audio/AudioListAdapter.java
rename to vlc-android/src/org/videolan/vlc/gui/audio/AudioPlaylistAdapter.java
index 135b9bf..d20efd7 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioListAdapter.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlaylistAdapter.java
@@ -41,12 +41,12 @@ import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-public class AudioListAdapter extends ArrayAdapter<Media> {
+public class AudioPlaylistAdapter extends ArrayAdapter<Media> {
 
     private ArrayList<Media> mMediaList;
     private int mCurrentIndex;
 
-    public AudioListAdapter(Context context) {
+    public AudioPlaylistAdapter(Context context) {
         super(context, 0);
         mMediaList = new ArrayList<Media>();
         mCurrentIndex = -1;
diff --git a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlaylistView.java b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlaylistView.java
index e306ee0..e84c428 100644
--- a/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlaylistView.java
+++ b/vlc-android/src/org/videolan/vlc/gui/audio/AudioPlaylistView.java
@@ -150,7 +150,7 @@ public class AudioPlaylistView extends ListView {
         Rect rect = new Rect();
         for (int i = 0; i < getChildCount(); i++) {
             View child = getChildAt(i);
-            AudioListAdapter.ViewHolder holder = (AudioListAdapter.ViewHolder)child.getTag();
+            AudioPlaylistAdapter.ViewHolder holder = (AudioPlaylistAdapter.ViewHolder)child.getTag();
 
             if (holder.position == mPositionDragStart) {
                 holder.layoutItem.setVisibility(LinearLayout.GONE);
@@ -177,7 +177,7 @@ public class AudioPlaylistView extends ListView {
             child.getHitRect(rect);
             if (rect.contains(getWidth() / 2, (int)mTouchY)) {
                 // Send back the performed change thanks to the listener.
-                AudioListAdapter.ViewHolder holder = (AudioListAdapter.ViewHolder)child.getTag();
+                AudioPlaylistAdapter.ViewHolder holder = (AudioPlaylistAdapter.ViewHolder)child.getTag();
                 if (mOnItemDraggedListener != null)
                     mOnItemDraggedListener.OnItemDradded(mPositionDragStart, holder.position);
                 b_foundHitChild = true;
@@ -193,7 +193,7 @@ public class AudioPlaylistView extends ListView {
 
         for (int i = 0; i < getChildCount(); i++) {
             View child = getChildAt(i);
-            AudioListAdapter.ViewHolder holder = (AudioListAdapter.ViewHolder)child.getTag();
+            AudioPlaylistAdapter.ViewHolder holder = (AudioPlaylistAdapter.ViewHolder)child.getTag();
             holder.layoutItem.setVisibility(LinearLayout.VISIBLE);
             holder.layoutFooter.setVisibility(LinearLayout.VISIBLE);
             holder.expansion.setVisibility(LinearLayout.GONE);



More information about the Android mailing list