From: <rol...@us...> - 2010-12-06 12:45:26
|
Revision: 4010 http://mp-plugins.svn.sourceforge.net/mp-plugins/?rev=4010&view=rev Author: rollsroyc3 Date: 2010-12-06 12:45:19 +0000 (Mon, 06 Dec 2010) Log Message: ----------- updated filenames and references to lowercase, few small fixes in pictures 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 trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/AndroidManifest.xml 2010-12-06 12:45:19 UTC (rev 4010) @@ -3,31 +3,31 @@ package="mediaportal.remote" android:versionCode="1" android:versionName="1.0"> <application android:icon="@drawable/icon" android:theme="@android:style/Theme.NoTitleBar" android:debuggable="true"> - <activity android:name=".Splash" android:label="@string/app_name" android:launchMode="singleInstance"> + <activity android:name=".splash" android:label="@string/app_name" android:launchMode="singleInstance"> <intent-filter> <action android:name="android.intent.action.MAIN" /> <category android:name="android.intent.category.LAUNCHER" /> </intent-filter> </activity> - <activity android:label="@string/app_name" android:name=".Main" android:launchMode="singleInstance"> + <activity android:label="@string/app_name" android:name=".main" android:launchMode="singleInstance"> <intent-filter> <action android:name="android.intent.action.DEFAULT" /> <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=".Pictures" android:launchMode="singleInstance"></activity> - <activity android:name=".Picturesfullscreen" android:launchMode="singleInstance"></activity> - <activity android:name=".MusicDir" android:launchMode="singleInstance"></activity> - <activity android:name=".Setup" 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=".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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MediaPlayerControl.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/MusicDir.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/PostWebserver.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbHandler.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDbXmlHandler.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirHandler.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveDirectoryXmlHandler.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/ReceiveHandler.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_01.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/Remote_02.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/httpHandler.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/main.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -34,7 +34,7 @@ import android.view.View; import android.widget.*; -public class Main extends Activity { +public class main extends Activity { private static final String PREFS_PRIVATE = "PREFS_MP_REMOTE"; @@ -56,7 +56,7 @@ Button btnPictures = (Button) findViewById(R.id.MainButton1); btnPictures.setOnClickListener(new View.OnClickListener() { public void onClick(View view) { - Intent myIntent = new Intent(view.getContext(), Pictures.class); + Intent myIntent = new Intent(view.getContext(), pictures.class); startActivityForResult(myIntent, 0); } }); @@ -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); } }); @@ -123,7 +123,7 @@ public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case 111: - Intent myIntent = new Intent(this, Setup.class); + Intent myIntent = new Intent(this, setup.class); startActivityForResult(myIntent, 0); return true; case 112: Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicAlbum.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicArtist.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicResults.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicSong.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/musicTab.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaying.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayingXmlHandler.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplayinghandler.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylistXmlHandler.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/nowplaylisthandler.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/pictures.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -23,8 +23,9 @@ 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; import android.content.Intent; import android.os.Bundle; @@ -41,12 +42,12 @@ import android.widget.AdapterView.OnItemClickListener; import android.widget.Toast; -public class Pictures extends Activity { +public class pictures extends Activity { 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 @@ -69,13 +70,13 @@ if (pic.typ == "item") { selectedPicture = position - 1; - Intent myIntent = new Intent(Pictures.this, - Picturesfullscreen.class); + Intent myIntent = new Intent(pictures.this, + picturesfullscreen.class); startActivityForResult(myIntent, 0); } if (pic.typ == "folder") { - actualDir += pic.title + "/"; + actualDir += pic.title.replaceAll(" ", "%20") + "/"; mHandler.removeCallbacks(mUpdateTimeTask); mHandler.postDelayed(mUpdateTimeTask, 0); @@ -116,18 +117,26 @@ private void update() { + ProgressDialog dialog = new ProgressDialog(this); + dialog.setCancelable(true); + dialog.setMessage("Loading..."); + dialog.show(); + + Log.d("update pictures", "do update folder : " + actualDir); - ReceiveDirHandler h = ReceiveDirHandler.getinstance(); + receivedirhandler h = receivedirhandler.getinstance(); pictureList = h.getPictureDir(actualDir); if (pictureList.size() == 0) { - Toast.makeText(Pictures.this, "TIME OUT SERVER", Toast.LENGTH_SHORT) + Toast.makeText(pictures.this, "TIME OUT SERVER", Toast.LENGTH_SHORT) .show(); } else { GridView gridview = (GridView) findViewById(R.id.GridView01); gridview.setAdapter(new ImageAdapter2(this)); } + + dialog.cancel(); } public class ImageAdapter2 extends BaseAdapter { @@ -189,12 +198,12 @@ iv.setTag(pic); } else { - httpHandler http = new httpHandler(); + httphandler http = new httphandler(); String file = "http://" + Settings.Server + ":" + Settings.Port + "/pictures/"; file += actualDir + item.File + ".thb"; - item.Picture = http.DownloadImage(file); + item.Picture = http.DownloadImage(file.replaceAll(" ", "%20")); iv.setImageBitmap(item.Picture); if (item.Picture == null) Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/picturesfullscreen.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -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; @@ -33,6 +33,8 @@ import android.view.Menu; import android.view.MenuItem; import android.view.View; +import android.view.Window; +import android.view.WindowManager; import android.view.ContextMenu.ContextMenuInfo; import android.view.GestureDetector.OnGestureListener; import android.view.MotionEvent; @@ -40,7 +42,7 @@ import android.widget.TextView; import android.widget.Toast; -public class Picturesfullscreen extends Activity implements OnGestureListener { +public class picturesfullscreen extends Activity implements OnGestureListener { private static final int SWIPE_MIN_DISTANCE = 120; private static final int SWIPE_MAX_OFF_PATH = 250; @@ -56,12 +58,19 @@ @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + + requestWindowFeature(Window.FEATURE_NO_TITLE); + getWindow().setFlags + (WindowManager.LayoutParams.FLAG_FULLSCREEN, + WindowManager.LayoutParams.FLAG_FULLSCREEN); + setContentView(R.layout.picturesfullscreen); + setContentView(R.layout.picturesfullscreen); gestureScanner = new GestureDetector(this); setPicture(); - Toast.makeText(Picturesfullscreen.this, "left/right swipe possible", + Toast.makeText(picturesfullscreen .this, "left/right swipe possible", Toast.LENGTH_SHORT).show(); // ImageView imagev = (ImageView) findViewById(R.id.ImageView01); @@ -70,17 +79,19 @@ private void setPicture() { ImageView imagev = (ImageView) findViewById(R.id.ImageView01); - DirItems item = Pictures.pictureList.get(Pictures.selectedPicture); - - httpHandler http = new httpHandler(); - String file = "http://" + Settings.Server + ":" + Settings.Port - + "/pictures/"; - file += Pictures.actualDir + item.File; - item.Picture = http.DownloadImage(file); - imagev.setImageBitmap(item.Picture); - - TextView txt = (TextView) findViewById(R.id.full_text); - txt.setText(item.File); + DirItems item = pictures.pictureList.get(pictures.selectedPicture); + if (!item.isFolder) + { + httphandler http = new httphandler(); + String file = "http://" + Settings.Server + ":" + Settings.Port + + "/pictures/"; + file += pictures.actualDir + item.File; + item.Picture = http.DownloadImage(file.replaceAll(" ", "%20")); + imagev.setImageBitmap(item.Picture); + + TextView txt = (TextView) findViewById(R.id.full_text); + txt.setText(item.File); + } } @Override @@ -124,18 +135,18 @@ if (slideShow) { if(!randomShow) { - int max = Pictures.pictureList.size(); + int max = pictures.pictureList.size(); - if (Pictures.selectedPicture < max - 1) - Pictures.selectedPicture++; + if (pictures.selectedPicture < max - 1) + pictures.selectedPicture++; else - Pictures.selectedPicture = 0; + pictures.selectedPicture = 0; setPicture(); } 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); @@ -163,7 +174,7 @@ float velocityY) { try { - int max = Pictures.pictureList.size(); + int max = pictures.pictureList.size(); if (Math.abs(e1.getY() - e2.getY()) > SWIPE_MAX_OFF_PATH) return false; @@ -171,21 +182,21 @@ if (e1.getX() - e2.getX() > SWIPE_MIN_DISTANCE && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) { - if (Pictures.selectedPicture < max - 1) { - Pictures.selectedPicture++; + if (pictures.selectedPicture < max - 1) { + pictures.selectedPicture++; setPicture(); } else - Toast.makeText(Picturesfullscreen.this, "reached end +", + Toast.makeText(picturesfullscreen.this, "reached end +", Toast.LENGTH_SHORT).show(); } else if (e2.getX() - e1.getX() > SWIPE_MIN_DISTANCE && Math.abs(velocityX) > SWIPE_THRESHOLD_VELOCITY) { - if (Pictures.selectedPicture > 0) { - Pictures.selectedPicture--; + if (pictures.selectedPicture > 0) { + pictures.selectedPicture--; setPicture(); - } - Toast.makeText(Picturesfullscreen.this, "reached end -", + } else + Toast.makeText(picturesfullscreen.this, "reached end -", Toast.LENGTH_SHORT).show(); } Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java 2010-12-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/setup.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -27,7 +27,7 @@ import android.os.Bundle; import android.widget.EditText; -public class Setup extends Activity { +public class setup extends Activity { public static final String PREFS_PRIVATE = "PREFS_MP_REMOTE"; Modified: trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java =================================================================== --- trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java 2010-12-05 21:44:07 UTC (rev 4009) +++ trunk/plugins/AndroidRemote/Android/MediaPortalRemote/src/mediaportal/remote/splash.java 2010-12-06 12:45:19 UTC (rev 4010) @@ -27,7 +27,7 @@ import android.os.Bundle; import android.os.Handler; -public class Splash extends Activity { +public class splash extends Activity { private final int SPLASH_DISPLAY_LENGHT = 1500; @@ -41,9 +41,9 @@ // @Override public void run() { /* Create an Intent that will start the main-Activity. */ - Intent mainIntent = new Intent(Splash.this, Main.class); - Splash.this.startActivity(mainIntent); - Splash.this.finish(); + Intent mainIntent = new Intent(splash.this, main.class); + splash.this.startActivity(mainIntent); + splash.this.finish(); } }, SPLASH_DISPLAY_LENGHT); } This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |