nutomic/controldna
Archived
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Update cling version

Browse source
This commit is contained in:
Adam Baker 2016-01-03 13:36:12 +00:00
parent 0c8489683e
commit 97551357ec
10 changed files with 83 additions and 73 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build.gradle
View file

@ -22,8 +22,12 @@ repositories {
dependencies { dependencies {
compile 'com.android.support:appcompat-v7:19.1.+' compile 'com.android.support:appcompat-v7:19.1.+'
compile 'com.android.support:mediarouter-v7:19.1.+' compile 'com.android.support:mediarouter-v7:19.1.+'
compile 'org.teleal.cling:cling-core:1.0.5+' compile 'org.fourthline.cling:cling-core:2.1.0'
compile 'org.teleal.cling:cling-support:1.0.5+' compile 'org.fourthline.cling:cling-support:2.1.0'
compile 'org.eclipse.jetty:jetty-server:8.1.8.v20121106'
compile 'org.eclipse.jetty:jetty-servlet:8.1.8.v20121106'
compile 'org.eclipse.jetty:jetty-client:8.1.8.v20121106'
compile 'org.slf4j:slf4j-jdk14:1.6.1'
} }
android { android {
@ -35,6 +39,11 @@ android {
disable 'InvalidPackage' disable 'InvalidPackage'
} }
packagingOptions {
exclude 'META-INF/beans.xml'
exclude 'about.html'
}
signingConfigs { signingConfigs {
release { release {
// Android Studio does not pass environment variables. // Android Studio does not pass environment variables.

5
src/main/AndroidManifest.xml
View file

@ -12,9 +12,10 @@
<uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/> <uses-permission android:name="android.permission.CHANGE_WIFI_MULTICAST_STATE"/>
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
<uses-permission android:name="android.permission.READ_PHONE_STATE"/> <uses-permission android:name="android.permission.READ_PHONE_STATE"/>
<uses-permission android:name="android.permission.WAKE_LOCK"/>
<uses-sdk <uses-sdk
android:minSdkVersion="8" android:minSdkVersion="15"
android:targetSdkVersion="19" /> android:targetSdkVersion="19" />
<application <application
@ -48,7 +49,7 @@
android:value=".gui.MainActivity" /> android:value=".gui.MainActivity" />
</activity> </activity>
<service android:name="org.teleal.cling.android.AndroidUpnpServiceImpl" /> <service android:name="org.fourthline.cling.android.AndroidUpnpServiceImpl" />
<service android:name=".mediarouter.MediaRouterPlayService" /> <service android:name=".mediarouter.MediaRouterPlayService" />

2
src/main/java/com/github/nutomic/controldlna/gui/MainActivity.java
View file

@ -49,7 +49,7 @@ import android.view.MenuItem;
import com.github.nutomic.controldlna.R; import com.github.nutomic.controldlna.R;
import org.teleal.cling.support.model.item.Item; import org.fourthline.cling.support.model.item.Item;
import java.util.List; import java.util.List;

2
src/main/java/com/github/nutomic/controldlna/gui/RouteFragment.java
View file

@ -68,7 +68,7 @@ import com.github.nutomic.controldlna.mediarouter.MediaRouterPlayServiceBinder;
import com.github.nutomic.controldlna.utility.FileArrayAdapter; import com.github.nutomic.controldlna.utility.FileArrayAdapter;
import com.github.nutomic.controldlna.utility.RouteAdapter; import com.github.nutomic.controldlna.utility.RouteAdapter;
import org.teleal.cling.support.model.item.Item; import org.fourthline.cling.support.model.item.Item;
import java.util.List; import java.util.List;

26
src/main/java/com/github/nutomic/controldlna/gui/ServerFragment.java
View file

@ -56,19 +56,19 @@ import com.github.nutomic.controldlna.gui.MainActivity.OnBackPressedListener;
import com.github.nutomic.controldlna.utility.DeviceArrayAdapter; import com.github.nutomic.controldlna.utility.DeviceArrayAdapter;
import com.github.nutomic.controldlna.utility.FileArrayAdapter; import com.github.nutomic.controldlna.utility.FileArrayAdapter;
import org.teleal.cling.android.AndroidUpnpService; import org.fourthline.cling.android.AndroidUpnpService;
import org.teleal.cling.android.AndroidUpnpServiceImpl; import org.fourthline.cling.android.AndroidUpnpServiceImpl;
import org.teleal.cling.model.action.ActionInvocation; import org.fourthline.cling.model.action.ActionInvocation;
import org.teleal.cling.model.message.UpnpResponse; import org.fourthline.cling.model.message.UpnpResponse;
import org.teleal.cling.model.meta.Device; import org.fourthline.cling.model.meta.Device;
import org.teleal.cling.model.meta.Service; import org.fourthline.cling.model.meta.Service;
import org.teleal.cling.model.types.ServiceType; import org.fourthline.cling.model.types.ServiceType;
import org.teleal.cling.model.types.UDN; import org.fourthline.cling.model.types.UDN;
import org.teleal.cling.support.contentdirectory.callback.Browse; import org.fourthline.cling.support.contentdirectory.callback.Browse;
import org.teleal.cling.support.model.BrowseFlag; import org.fourthline.cling.support.model.BrowseFlag;
import org.teleal.cling.support.model.DIDLContent; import org.fourthline.cling.support.model.DIDLContent;
import org.teleal.cling.support.model.container.Container; import org.fourthline.cling.support.model.container.Container;
import org.teleal.cling.support.model.item.Item; import org.fourthline.cling.support.model.item.Item;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.List; import java.util.List;

10
src/main/java/com/github/nutomic/controldlna/mediarouter/MediaRouterPlayService.java
View file

@ -55,11 +55,11 @@ import com.github.nutomic.controldlna.gui.PreferencesActivity;
import com.github.nutomic.controldlna.gui.RouteFragment; import com.github.nutomic.controldlna.gui.RouteFragment;
import com.github.nutomic.controldlna.utility.LoadImageTask; import com.github.nutomic.controldlna.utility.LoadImageTask;
import org.teleal.cling.support.contentdirectory.DIDLParser; import org.fourthline.cling.support.contentdirectory.DIDLParser;
import org.teleal.cling.support.model.DIDLContent; import org.fourthline.cling.support.model.DIDLContent;
import org.teleal.cling.support.model.DIDLObject; import org.fourthline.cling.support.model.DIDLObject;
import org.teleal.cling.support.model.item.Item; import org.fourthline.cling.support.model.item.Item;
import org.teleal.cling.support.model.item.MusicTrack; import org.fourthline.cling.support.model.item.MusicTrack;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
import java.util.ArrayList; import java.util.ArrayList;

30
src/main/java/com/github/nutomic/controldlna/upnp/RemotePlayService.java
View file

@ -45,19 +45,19 @@ import android.util.Log;
import com.github.nutomic.controldlna.R; import com.github.nutomic.controldlna.R;
import org.teleal.cling.android.AndroidUpnpService; import org.fourthline.cling.android.AndroidUpnpService;
import org.teleal.cling.android.AndroidUpnpServiceImpl; import org.fourthline.cling.android.AndroidUpnpServiceImpl;
import org.teleal.cling.model.action.ActionInvocation; import org.fourthline.cling.model.action.ActionInvocation;
import org.teleal.cling.model.message.UpnpResponse; import org.fourthline.cling.model.message.UpnpResponse;
import org.teleal.cling.model.meta.Device; import org.fourthline.cling.model.meta.Device;
import org.teleal.cling.model.meta.LocalDevice; import org.fourthline.cling.model.meta.LocalDevice;
import org.teleal.cling.model.meta.RemoteDevice; import org.fourthline.cling.model.meta.RemoteDevice;
import org.teleal.cling.model.meta.StateVariableAllowedValueRange; import org.fourthline.cling.model.meta.StateVariableAllowedValueRange;
import org.teleal.cling.model.types.ServiceType; import org.fourthline.cling.model.types.ServiceType;
import org.teleal.cling.model.types.UDN; import org.fourthline.cling.model.types.UDN;
import org.teleal.cling.registry.Registry; import org.fourthline.cling.registry.Registry;
import org.teleal.cling.registry.RegistryListener; import org.fourthline.cling.registry.RegistryListener;
import org.teleal.cling.support.renderingcontrol.callback.GetVolume; import org.fourthline.cling.support.renderingcontrol.callback.GetVolume;
import java.util.Map.Entry; import java.util.Map.Entry;
import java.util.WeakHashMap; import java.util.WeakHashMap;
@ -208,7 +208,7 @@ public class RemotePlayService extends Service implements RegistryListener {
/** /**
* Returns a device service by name for direct queries. * Returns a device service by name for direct queries.
*/ */
org.teleal.cling.model.meta.Service<?, ?> getService( org.fourthline.cling.model.meta.Service<?, ?> getService(
Device<?, ?, ?> device, String name) { Device<?, ?, ?> device, String name) {
return device.findService(new ServiceType("schemas-upnp-org", name)); return device.findService(new ServiceType("schemas-upnp-org", name));
} }
@ -220,7 +220,7 @@ public class RemotePlayService extends Service implements RegistryListener {
if (mDevices.containsValue(device)) if (mDevices.containsValue(device))
return; return;
final org.teleal.cling.model.meta.Service<?, ?> rc = getService(device, "RenderingControl"); final org.fourthline.cling.model.meta.Service<?, ?> rc = getService(device, "RenderingControl");
if (rc == null || mListener == null) if (rc == null || mListener == null)
return; return;

44
src/main/java/com/github/nutomic/controldlna/upnp/RemotePlayServiceBinder.java
View file

@ -33,26 +33,26 @@ import java.util.Date;
import java.util.Map; import java.util.Map;
import java.util.TimeZone; import java.util.TimeZone;
import org.teleal.cling.controlpoint.SubscriptionCallback; import org.fourthline.cling.controlpoint.SubscriptionCallback;
import org.teleal.cling.model.action.ActionInvocation; import org.fourthline.cling.model.action.ActionInvocation;
import org.teleal.cling.model.gena.CancelReason; import org.fourthline.cling.model.gena.CancelReason;
import org.teleal.cling.model.gena.GENASubscription; import org.fourthline.cling.model.gena.GENASubscription;
import org.teleal.cling.model.message.UpnpResponse; import org.fourthline.cling.model.message.UpnpResponse;
import org.teleal.cling.model.meta.Device; import org.fourthline.cling.model.meta.Device;
import org.teleal.cling.model.state.StateVariableValue; import org.fourthline.cling.model.state.StateVariableValue;
import org.teleal.cling.model.types.ServiceType; import org.fourthline.cling.model.types.ServiceType;
import org.teleal.cling.support.avtransport.callback.GetPositionInfo; import org.fourthline.cling.support.avtransport.callback.GetPositionInfo;
import org.teleal.cling.support.avtransport.callback.Pause; import org.fourthline.cling.support.avtransport.callback.Pause;
import org.teleal.cling.support.avtransport.callback.Play; import org.fourthline.cling.support.avtransport.callback.Play;
import org.teleal.cling.support.avtransport.callback.Seek; import org.fourthline.cling.support.avtransport.callback.Seek;
import org.teleal.cling.support.avtransport.callback.SetAVTransportURI; import org.fourthline.cling.support.avtransport.callback.SetAVTransportURI;
import org.teleal.cling.support.avtransport.callback.Stop; import org.fourthline.cling.support.avtransport.callback.Stop;
import org.teleal.cling.support.avtransport.lastchange.AVTransportLastChangeParser; import org.fourthline.cling.support.avtransport.lastchange.AVTransportLastChangeParser;
import org.teleal.cling.support.avtransport.lastchange.AVTransportVariable; import org.fourthline.cling.support.avtransport.lastchange.AVTransportVariable;
import org.teleal.cling.support.lastchange.LastChange; import org.fourthline.cling.support.lastchange.LastChange;
import org.teleal.cling.support.model.PositionInfo; import org.fourthline.cling.support.model.PositionInfo;
import org.teleal.cling.support.model.SeekMode; import org.fourthline.cling.support.model.SeekMode;
import org.teleal.cling.support.renderingcontrol.callback.SetVolume; import org.fourthline.cling.support.renderingcontrol.callback.SetVolume;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.os.Message; import android.os.Message;
@ -218,7 +218,7 @@ public class RemotePlayServiceBinder extends IRemotePlayService.Stub {
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@Override @Override
public void failure(ActionInvocation invocation, public void failure(ActionInvocation invocation,
org.teleal.cling.model.message.UpnpResponse operation, org.fourthline.cling.model.message.UpnpResponse operation,
String defaultMessage) { String defaultMessage) {
Log.w(TAG, "Stop failed: " + defaultMessage); Log.w(TAG, "Stop failed: " + defaultMessage);
mRps.sendError("Stop failed: " + defaultMessage); mRps.sendError("Stop failed: " + defaultMessage);
@ -320,7 +320,7 @@ public class RemotePlayServiceBinder extends IRemotePlayService.Stub {
@SuppressWarnings("rawtypes") @SuppressWarnings("rawtypes")
@Override @Override
public void failure(ActionInvocation invocation, public void failure(ActionInvocation invocation,
org.teleal.cling.model.message.UpnpResponse operation, org.fourthline.cling.model.message.UpnpResponse operation,
String defaultMessage) { String defaultMessage) {
Log.w(TAG, "Stop failed: " + defaultMessage); Log.w(TAG, "Stop failed: " + defaultMessage);
mRps.sendError("Stop failed: " + defaultMessage); mRps.sendError("Stop failed: " + defaultMessage);

10
src/main/java/com/github/nutomic/controldlna/utility/DeviceArrayAdapter.java
View file

@ -38,11 +38,11 @@ import android.widget.TextView;
import com.github.nutomic.controldlna.R; import com.github.nutomic.controldlna.R;
import org.teleal.cling.model.meta.Device; import org.fourthline.cling.model.meta.Device;
import org.teleal.cling.model.meta.LocalDevice; import org.fourthline.cling.model.meta.LocalDevice;
import org.teleal.cling.model.meta.RemoteDevice; import org.fourthline.cling.model.meta.RemoteDevice;
import org.teleal.cling.registry.Registry; import org.fourthline.cling.registry.Registry;
import org.teleal.cling.registry.RegistryListener; import org.fourthline.cling.registry.RegistryListener;
import java.net.URI; import java.net.URI;
import java.net.URISyntaxException; import java.net.URISyntaxException;

14
src/main/java/com/github/nutomic/controldlna/utility/FileArrayAdapter.java
View file

@ -30,13 +30,13 @@ package com.github.nutomic.controldlna.utility;
import java.net.URI; import java.net.URI;
import java.util.List; import java.util.List;
import org.teleal.cling.support.model.DIDLObject; import org.fourthline.cling.support.model.DIDLObject;
import org.teleal.cling.support.model.item.AudioItem; import org.fourthline.cling.support.model.item.AudioItem;
import org.teleal.cling.support.model.item.ImageItem; import org.fourthline.cling.support.model.item.ImageItem;
import org.teleal.cling.support.model.item.Item; import org.fourthline.cling.support.model.item.Item;
import org.teleal.cling.support.model.item.PlaylistItem; import org.fourthline.cling.support.model.item.PlaylistItem;
import org.teleal.cling.support.model.item.VideoItem; import org.fourthline.cling.support.model.item.VideoItem;
import org.teleal.cling.support.model.item.MusicTrack; import org.fourthline.cling.support.model.item.MusicTrack;
import android.content.Context; import android.content.Context;
import android.view.LayoutInflater; import android.view.LayoutInflater;