Menu
▾
▴
[Mp-plugins-svn] SF.net SVN: mp-plugins:[4015] trunk/plugins/AndroidRemote/Android/ MediaPortalRemote
|
From: <Rol...@us...> - 2010-12-06 23:02:02
|
Revision: 4015
http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4015&view=rev
Author: Rollsroyc3
Date: 2010-12-06 23:01:55 +0000 (Mon, 06 Dec 2010)
Log Message:
-----------
Modified Paths:
--------------
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-06 23:01:55 UTC (rev 4015)
@@ -15,19 +15,19 @@
<category android:name="android.intent.category.VIEW" />
</intent-filter>
</activity>
- <activity android:name=".remote_01" android:launchMode="singleInstance"></activity>
- <activity android:name=".remote_02" android:launchMode="singleInstance"></activity>
+ <activity android:name=".Remote_01" android:launchMode="singleInstance"></activity>
+ <activity android:name=".Remote_02" android:launchMode="singleInstance"></activity>
<activity android:name=".pictures" android:launchMode="singleInstance"></activity>
<activity android:name=".picturesfullscreen" android:launchMode="singleInstance"></activity>
- <activity android:name=".musicdir" android:launchMode="singleInstance"></activity>
+ <activity android:name=".MusicDir" android:launchMode="singleInstance"></activity>
<activity android:name=".setup" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaying" android:launchMode="singleInstance"></activity>
<activity android:name=".nowplaylist" android:launchMode="singleInstance"></activity>
- <activity android:name=".musicartist" android:launchMode="singleInstance"></activity>
- <activity android:name=".musicalbum" android:launchMode="singleInstance"></activity>
- <activity android:name=".musicsong" android:launchMode="singleInstance"></activity>
- <activity android:name=".musictab" android:launchMode="singleInstance"></activity>
- <activity android:name=".musicresults" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicArtist" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicAlbum" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicSong" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicTab" android:launchMode="singleInstance"></activity>
+ <activity android:name=".musicResults" android:launchMode="singleInstance"></activity>
</application>
<uses-sdk android:minSdkVersion="3" />
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -4,16 +4,16 @@
import android.media.MediaPlayer;
-public class mediaplayercontrol {
+public class MediaPlayerControl {
- private static mediaplayercontrol instance;
+ private static MediaPlayerControl instance;
private static MediaPlayer mp;
- public static mediaplayercontrol getinstance() {
+ public static MediaPlayerControl getinstance() {
if (mp == null)
mp = new MediaPlayer();
if (instance == null)
- instance = new mediaplayercontrol();
+ instance = new MediaPlayerControl();
return instance;
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -23,7 +23,7 @@
import java.util.ArrayList;
import mediaportal.remote.R;
-import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
+import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
import android.content.Context;
import android.os.Bundle;
@@ -40,11 +40,11 @@
import android.widget.AdapterView.OnItemClickListener;
import android.widget.Toast;
-public class musicdir extends Activity {
+public class MusicDir extends Activity {
private Handler mHandler = new Handler();
private String actualDir = "";
- private static ArrayList<receivedirectoryxmlhandler.DirItems> musicList;
+ private static ArrayList<ReceiveDirectoryXmlHandler.DirItems> musicList;
@Override
public void onCreate(Bundle savedInstanceState) {
@@ -55,7 +55,7 @@
mHandler.postDelayed(mUpdateTimeTask, 100);
GridView gridview = (GridView) findViewById(R.id.music_grid);
- gridview.setAdapter(new ImageAdapter2(musicdir.this));
+ gridview.setAdapter(new ImageAdapter2(MusicDir.this));
gridview.setOnItemClickListener(new OnItemClickListener() {
public void onItemClick(AdapterView<?> parent, View v,
int position, long id) {
@@ -116,11 +116,11 @@
Log.d("update music dir", "do update folder : " + actualDir);
- receivedirhandler h = receivedirhandler.getinstance();
+ ReceiveDirHandler h = ReceiveDirHandler.getinstance();
musicList = h.getMusicDir(actualDir);
if (musicList.size() == 0) {
- Toast.makeText(musicdir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
+ Toast.makeText(MusicDir.this, "TIME OUT SERVER", Toast.LENGTH_SHORT)
.show();
} else {
GridView gridview = (GridView) findViewById(R.id.music_grid);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -32,12 +32,12 @@
import org.apache.http.params.HttpConnectionParams;
import org.apache.http.params.HttpParams;
-public class postwebserver {
+public class PostWebserver {
public String httpServer = "";
public String httpPort = "";
- public postwebserver(String Server, String Port) {
+ public PostWebserver(String Server, String Port) {
httpServer = Server;
httpPort = Port;
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -24,17 +24,17 @@
import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.ArrayList;
-import mediaportal.remote.receivedbxmlhandler.DbItems;
+import mediaportal.remote.ReceiveDbXmlHandler.DbItems;
-public class receivedbhandler {
+public class ReceiveDbHandler {
- private static receivedbhandler instance;
+ private static ReceiveDbHandler instance;
public int selectedMusic;
- public static receivedbhandler getinstance() {
+ public static ReceiveDbHandler getinstance() {
if (instance == null)
- instance = new receivedbhandler();
+ instance = new ReceiveDbHandler();
return instance;
}
@@ -56,8 +56,8 @@
private ArrayList<DbItems> fetchData(String Data) {
- receivedbxmlhandler handler = new receivedbxmlhandler();
- receivehandler hand = new receivehandler(handler);
+ ReceiveDbXmlHandler handler = new ReceiveDbXmlHandler();
+ ReceiveHandler hand = new ReceiveHandler(handler);
try {
Data = URLEncoder.encode(Data, "UTF-8");
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -27,7 +27,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-public class receivedbxmlhandler extends DefaultHandler {
+public class ReceiveDbXmlHandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -22,16 +22,16 @@
package mediaportal.remote;
import java.util.ArrayList;
-import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
+import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
-public class receivedirhandler {
+public class ReceiveDirHandler {
- private static receivedirhandler instance;
+ private static ReceiveDirHandler instance;
private static String actualDir;
- public static receivedirhandler getinstance() {
+ public static ReceiveDirHandler getinstance() {
if (instance == null)
- instance = new receivedirhandler();
+ instance = new ReceiveDirHandler();
return instance;
}
@@ -60,8 +60,8 @@
private ArrayList<DirItems> fetchData(String Data) {
- receivedirectoryxmlhandler handler = new receivedirectoryxmlhandler();
- receivehandler hand = new receivehandler(handler);
+ ReceiveDirectoryXmlHandler handler = new ReceiveDirectoryXmlHandler();
+ ReceiveHandler hand = new ReceiveHandler(handler);
hand.readValues(Data);
return handler.DirList;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -28,7 +28,7 @@
import android.graphics.Bitmap;
-public class receivedirectoryxmlhandler extends DefaultHandler {
+public class ReceiveDirectoryXmlHandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -34,11 +34,11 @@
import org.xml.sax.SAXException;
import org.xml.sax.XMLReader;
-public class receivehandler {
+public class ReceiveHandler {
private org.xml.sax.ContentHandler _handler;
- public receivehandler(org.xml.sax.ContentHandler Handler) {
+ public ReceiveHandler(org.xml.sax.ContentHandler Handler) {
_handler = Handler;
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -37,7 +37,7 @@
import android.view.GestureDetector.OnGestureListener;
import android.widget.Button;
-public class remote_01 extends Activity implements OnGestureListener {
+public class Remote_01 extends Activity implements OnGestureListener {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private String HttpServer = "";
@@ -177,7 +177,7 @@
public void PostCommand(String button) {
- postwebserver post = new postwebserver(HttpServer, HttpPort);
+ PostWebserver post = new PostWebserver(HttpServer, HttpPort);
AssetManager assetManager = getAssets();
String xml = "";
@@ -210,7 +210,7 @@
// right to left swipe
if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
- Intent myIntent = new Intent(this, remote_02.class);
+ Intent myIntent = new Intent(this, Remote_02.class);
startActivityForResult(myIntent, 0);
} else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -35,7 +35,7 @@
import android.view.GestureDetector.OnGestureListener;
import android.widget.Button;
-public class remote_02 extends Activity implements OnGestureListener {
+public class Remote_02 extends Activity implements OnGestureListener {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private String HttpServer = "";
@@ -134,7 +134,7 @@
public void PostCommand(String button) {
- postwebserver post = new postwebserver(HttpServer, HttpPort);
+ PostWebserver post = new PostWebserver(HttpServer, HttpPort);
AssetManager assetManager = getAssets();
String xml = "";
@@ -171,7 +171,7 @@
} else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE
&& Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) {
- Intent myIntent = new Intent(this, remote_01.class);
+ Intent myIntent = new Intent(this, Remote_01.class);
startActivityForResult(myIntent, 0);
}
} catch (Exception e) {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -17,11 +17,11 @@
import android.graphics.BitmapFactory;
import android.os.Environment;
-public class httphandler {
+public class httpHandler {
String extStorageDirectory;
- public httphandler() {
+ public httpHandler() {
}
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -64,7 +64,7 @@
Button btnMusic = (Button) findViewById(R.id.MainButton2);
btnMusic.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), musictab.class);
+ Intent myIntent = new Intent(view.getContext(), musicTab.class);
startActivityForResult(myIntent, 0);
}
});
@@ -97,7 +97,7 @@
Button btnRemote = (Button) findViewById(R.id.MainButton4);
btnRemote.setOnClickListener(new View.OnClickListener() {
public void onClick(View view) {
- Intent myIntent = new Intent(view.getContext(), remote_01.class);
+ Intent myIntent = new Intent(view.getContext(), Remote_01.class);
startActivityForResult(myIntent, 0);
}
});
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -39,18 +39,18 @@
import android.widget.TextView;
import android.widget.Toast;
-public class musicalbum extends Activity {
+public class musicAlbum extends Activity {
private Handler mHandler = new Handler();
- private static ArrayList<receivedbxmlhandler.DbItems> albumList;
+ private static ArrayList<ReceiveDbXmlHandler.DbItems> albumList;
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.music_album);
ListView l1 = (ListView) findViewById(R.id.list_album);
- l1.setAdapter(new EfficientAdapter(musicalbum.this));
+ l1.setAdapter(new EfficientAdapter(musicAlbum.this));
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
@@ -83,11 +83,11 @@
Log.d("update album", "do update");
- receivedbhandler handler = receivedbhandler.getinstance();
+ ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
albumList = handler.GetAlbums();
if (albumList.size() == 0) {
- Toast.makeText(musicalbum.this, "TIME OUT SERVER",
+ Toast.makeText(musicAlbum.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
@@ -134,7 +134,7 @@
holder = (ViewHolder) convertView.getTag();
}
- receivedbxmlhandler.DbItems item = albumList.get(position);
+ ReceiveDbXmlHandler.DbItems item = albumList.get(position);
holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Album + " - " + item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -39,19 +39,19 @@
import android.widget.TextView;
import android.widget.Toast;
-public class musicartist extends Activity{
+public class musicArtist extends Activity{
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
- private static ArrayList<receivedbxmlhandler.DbItems> artistList;
+ private static ArrayList<ReceiveDbXmlHandler.DbItems> artistList;
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.music_artist);
ListView l1 = (ListView) findViewById(R.id.list_artist);
- l1.setAdapter(new EfficientAdapter(musicartist.this));
+ l1.setAdapter(new EfficientAdapter(musicArtist.this));
l1.setOnItemClickListener(new AdapterView.OnItemClickListener()
{
@@ -59,9 +59,9 @@
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
- receivedbxmlhandler.DbItems item = artistList.get(arg2);
- musicresults.Select = item.Artist;
- Intent myIntent = new Intent(arg1.getContext(), musicresults.class);
+ ReceiveDbXmlHandler.DbItems item = artistList.get(arg2);
+ musicResults.Select = item.Artist;
+ Intent myIntent = new Intent(arg1.getContext(), musicResults.class);
startActivityForResult(myIntent, 0);
}
}
@@ -89,11 +89,11 @@
Log.d("update artist", "do update");
- receivedbhandler handler = receivedbhandler .getinstance();
+ ReceiveDbHandler handler = ReceiveDbHandler .getinstance();
artistList = handler.GetArtist();
if (artistList.size() == 0) {
- Toast.makeText(musicartist.this, "TIME OUT SERVER",
+ Toast.makeText(musicArtist.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
@@ -138,7 +138,7 @@
holder = (ViewHolder) convertView.getTag();
}
- receivedbxmlhandler.DbItems item = artistList.get(position);
+ ReceiveDbXmlHandler.DbItems item = artistList.get(position);
holder.text.setText(String.valueOf(position +1));
holder.text2.setText(item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -40,12 +40,12 @@
import android.widget.TextView;
import android.widget.Toast;
-public class musicresults extends Activity {
+public class musicResults extends Activity {
public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE";
private Handler mHandler = new Handler();
- private static ArrayList<receivedbxmlhandler.DbItems> itemList;
+ private static ArrayList<ReceiveDbXmlHandler.DbItems> itemList;
public static String Select = "";
@@ -54,7 +54,7 @@
setContentView(R.layout.music_results);
ListView l1 = (ListView) findViewById(R.id.list_result);
- l1.setAdapter(new EfficientAdapter(musicresults.this));
+ l1.setAdapter(new EfficientAdapter(musicResults.this));
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
@@ -80,9 +80,9 @@
if (x == -1)
x = 0;
if (itemList.size() > 0) {
- receivedbxmlhandler.DbItems itm = itemList.get(x);
+ ReceiveDbXmlHandler.DbItems itm = itemList.get(x);
- httphandler http = new httphandler();
+ httpHandler http = new httpHandler();
http.DownloadFile();
}
x = 1;
@@ -112,11 +112,11 @@
Log.d("update search", "do update");
- receivedbhandler handler = receivedbhandler.getinstance();
+ ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
itemList = handler.GetSongsByArtist(Select);
if (itemList.size() == 0) {
- Toast.makeText(musicresults.this, "TIME OUT SERVER",
+ Toast.makeText(musicResults.this, "TIME OUT SERVER",
Toast.LENGTH_LONG).show();
}
@@ -163,7 +163,7 @@
holder = (ViewHolder) convertView.getTag();
}
- receivedbxmlhandler.DbItems item = itemList.get(position);
+ ReceiveDbXmlHandler.DbItems item = itemList.get(position);
holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Title + " - " + item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -39,11 +39,11 @@
import android.widget.TextView;
import android.widget.Toast;
-public class musicsong extends Activity {
+public class musicSong extends Activity {
private Handler mHandler = new Handler();
- private static ArrayList<receivedbxmlhandler.DbItems> songList;
+ private static ArrayList<ReceiveDbXmlHandler.DbItems> songList;
public static String Select = "";
@@ -52,7 +52,7 @@
setContentView(R.layout.music_song);
ListView l1 = (ListView) findViewById(R.id.list_song);
- l1.setAdapter(new EfficientAdapter(musicsong.this));
+ l1.setAdapter(new EfficientAdapter(musicSong.this));
ColorDrawable divcolor = new ColorDrawable(Color.DKGRAY);
l1.setDivider(divcolor);
@@ -63,7 +63,7 @@
public void onItemClick(AdapterView<?> arg0, View arg1, int arg2,
long arg3) {
- mediaplayercontrol mp = mediaplayercontrol.getinstance();
+ MediaPlayerControl mp = MediaPlayerControl.getinstance();
mp.Play("http://" + Settings.Server + ":" + Settings.Port + "/music/" + "song-marianne-plays-on-piano-sense-and-sensibilit.mp3");
}
});
@@ -87,11 +87,11 @@
Log.d("update song", "do update");
- receivedbhandler handler = receivedbhandler.getinstance();
+ ReceiveDbHandler handler = ReceiveDbHandler.getinstance();
songList = handler.GetSongs();
if (songList.size() == 0) {
- Toast.makeText(musicsong.this, "TIME OUT SERVER", Toast.LENGTH_LONG)
+ Toast.makeText(musicSong.this, "TIME OUT SERVER", Toast.LENGTH_LONG)
.show();
}
@@ -138,7 +138,7 @@
holder = (ViewHolder) convertView.getTag();
}
- receivedbxmlhandler.DbItems item = songList.get(position);
+ ReceiveDbXmlHandler.DbItems item = songList.get(position);
holder.text.setText(String.valueOf(position + 1));
holder.text2.setText(item.Title + " - " + item.Artist);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -27,7 +27,7 @@
import android.os.Bundle;
import android.widget.TabHost;
-public class musictab extends TabActivity {
+public class musicTab extends TabActivity {
public void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.musictab);
@@ -38,7 +38,7 @@
Intent intent; // Reusable Intent for each tab
// Create an Intent to launch an Activity for the tab (to be reused)
- intent = new Intent().setClass(this, musicartist.class);
+ intent = new Intent().setClass(this, musicArtist.class);
// Initialize a TabSpec for each tab and add it to the TabHost
spec = tabHost.newTabSpec("artists")
.setIndicator("Artists", res.getDrawable(R.drawable.ic_tab1))
@@ -46,19 +46,19 @@
tabHost.addTab(spec);
// Do the same for the other tabs
- intent = new Intent().setClass(this, musicalbum.class);
+ intent = new Intent().setClass(this, musicAlbum.class);
spec = tabHost.newTabSpec("albums")
.setIndicator("Albums", res.getDrawable(R.drawable.ic_tab2))
.setContent(intent);
tabHost.addTab(spec);
- intent = new Intent().setClass(this, musicsong.class);
+ intent = new Intent().setClass(this, musicSong.class);
spec = tabHost.newTabSpec("songs")
.setIndicator("Songs", res.getDrawable(R.drawable.ic_tab3))
.setContent(intent);
tabHost.addTab(spec);
- intent = new Intent().setClass(this, musicdir.class);
+ intent = new Intent().setClass(this, MusicDir.class);
spec = tabHost.newTabSpec("music")
.setIndicator("Music", res.getDrawable(R.drawable.ic_tab4))
.setContent(intent);
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -149,7 +149,7 @@
if (nowplayinghandler.Cover.equals("True")) {
if (!lastTitle.equals(nowplayinghandler.Title)) {
- httphandler h = new httphandler();
+ httpHandler h = new httpHandler();
Bitmap bitmap = h.DownloadImage("http://" + HttpServer + ":"
+ HttpPort + "/nowplaying/cover");
if (bitmap != null) {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -4,7 +4,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-public class nowplayingxmlhandler extends DefaultHandler {
+public class nowplayingXmlHandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -93,7 +93,7 @@
e.printStackTrace();
}
- nowplayingxmlhandler handler = new nowplayingxmlhandler();
+ nowplayingXmlHandler handler = new nowplayingXmlHandler();
reader.setContentHandler(handler);
try {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -4,7 +4,7 @@
import org.xml.sax.SAXException;
import org.xml.sax.helpers.DefaultHandler;
-public class nowplaylistxmlhandler extends DefaultHandler {
+public class nowplaylistXmlHandler extends DefaultHandler {
Boolean currentElement = false;
String currentValue = null;
nowplaylisthandler.PlayListItem item = null;
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -95,7 +95,7 @@
e.printStackTrace();
}
- nowplaylistxmlhandler handler = new nowplaylistxmlhandler();
+ nowplaylistXmlHandler handler = new nowplaylistXmlHandler();
reader.setContentHandler(handler);
try {
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -23,7 +23,7 @@
import java.util.ArrayList;
import mediaportal.remote.R;
-import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
+import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
import android.app.ProgressDialog;
import android.content.Context;
@@ -47,7 +47,7 @@
private Handler mHandler = new Handler();
public static String actualDir = "";
- public static ArrayList<receivedirectoryxmlhandler.DirItems> pictureList;
+ public static ArrayList<ReceiveDirectoryXmlHandler.DirItems> pictureList;
public static int selectedPicture;
@Override
@@ -125,7 +125,7 @@
Log.d("update pictures", "do update folder : " + actualDir);
- receivedirhandler h = receivedirhandler.getinstance();
+ ReceiveDirHandler h = ReceiveDirHandler.getinstance();
pictureList = h.getPictureDir(actualDir);
if (pictureList.size() == 0) {
@@ -198,7 +198,7 @@
iv.setTag(pic);
} else {
- httphandler http = new httphandler();
+ httpHandler http = new httpHandler();
String file = "http://" + Settings.Server + ":"
+ Settings.Port + "/pictures/";
Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java
===================================================================
--- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-06 18:45:27 UTC (rev 4014)
+++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-06 23:01:55 UTC (rev 4015)
@@ -22,7 +22,7 @@
package mediaportal.remote;
import mediaportal.remote.R;
-import mediaportal.remote.receivedirectoryxmlhandler.DirItems;
+import mediaportal.remote.ReceiveDirectoryXmlHandler.DirItems;
import android.app.Activity;
import android.content.Intent;
import android.graphics.Bitmap;
@@ -82,7 +82,7 @@
DirItems item = pictures.pictureList.get(pictures.selectedPicture);
if (!item.isFolder)
{
- httphandler http = new httphandler();
+ httpHandler http = new httpHandler();
String file = "http://" + Settings.Server + ":" + Settings.Port
+ "/pictures/";
file += pictures.actualDir + item.File;
@@ -146,7 +146,7 @@
else
{
String req = "http://" + Settings.Server + ":" + Settings.Port +"/random/pictures/random.jpg";
- httphandler handler = new httphandler();
+ httpHandler handler = new httpHandler();
Bitmap pic = handler.DownloadImage(req);
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
