Skip to content

Commit

Permalink
Fixed Broken Airplay from Previous Commit.
Browse files Browse the repository at this point in the history
  • Loading branch information
Boggartfly committed Nov 10, 2014
1 parent f0ca743 commit 9c5a8a8
Show file tree
Hide file tree
Showing 32 changed files with 943 additions and 146 deletions.
Binary file modified .gradle/1.12/taskArtifacts/cache.properties.lock
Binary file not shown.
Binary file modified .gradle/1.12/taskArtifacts/fileHashes.bin
Binary file not shown.
Binary file modified .gradle/1.12/taskArtifacts/fileSnapshots.bin
Binary file not shown.
Binary file modified .gradle/1.12/taskArtifacts/outputFileStates.bin
Binary file not shown.
Binary file modified .gradle/1.12/taskArtifacts/taskArtifacts.bin
Binary file not shown.
481 changes: 352 additions & 129 deletions .idea/workspace.xml

Large diffs are not rendered by default.

12 changes: 1 addition & 11 deletions AndroidManifest.xml
Expand Up @@ -3,9 +3,7 @@
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
Expand Down Expand Up @@ -47,15 +45,7 @@ See the License for the specific language governing permissions and
</intent-filter>
</activity>

<service
android:name=".provider.EasyMediaRouteProviderService"
android:exported="false"
android:label="@string/media_route_provider_service"
android:process=":mrp">
<intent-filter>
<action android:name="android.media.MediaRouteProviderService" />
</intent-filter>
</service>

</application>

</manifest>
1 change: 0 additions & 1 deletion EasyCast.iml
Expand Up @@ -75,7 +75,6 @@
<orderEntry type="jdk" jdkName="Android API 21 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="android-support-v4" level="project" />
<orderEntry type="library" exported="" name="thumbnailator-0.4.7-all" level="project" />
<orderEntry type="library" exported="" name="jmdns" level="project" />
</component>
</module>
Expand Down
1 change: 0 additions & 1 deletion build.gradle
Expand Up @@ -10,7 +10,6 @@ apply plugin: 'android'

dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
compile files('libs/thumbnailator-0.4.7-all.jar')
}

android {
Expand Down
4 changes: 3 additions & 1 deletion build/generated/source/r/debug/com/laer/easycast/R.java
Expand Up @@ -155,7 +155,9 @@ public static final class string {
public static final int media_route_provider_service=0x7f060005;
public static final int search_lan=0x7f060006;
public static final int select_a_media_item=0x7f060007;
public static final int switch_router=0x7f060008;
public static final int start=0x7f060008;
public static final int stop=0x7f060009;
public static final int switch_router=0x7f06000a;
}
public static final class style {
public static final int AppTheme=0x7f070000;
Expand Down
Binary file modified build/intermediates/model_data.bin
Binary file not shown.
Binary file added libs/jetty-continuation-7.2.2.v20101205.jar
Binary file not shown.
Binary file added libs/jetty-http-7.2.2.v20101205.jar
Binary file not shown.
Binary file added libs/jetty-io-7.2.2.v20101205.jar
Binary file not shown.
Binary file added libs/jetty-server-7.2.2.v20101205.jar
Binary file not shown.
Binary file added libs/jetty-util-7.2.2.v20101205.jar
Binary file not shown.
Binary file added libs/servlet-api-2.5.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion res/layout/imagepane.xml
Expand Up @@ -29,6 +29,7 @@ See the License for the specific language governing permissions and
android:layout_height="match_parent"
android:layout_alignParentTop="true"
android:gravity="center"
android:numColumns="3"></GridView>
android:numColumns="3" />


</RelativeLayout>
2 changes: 2 additions & 0 deletions res/values/strings.xml
Expand Up @@ -23,5 +23,7 @@ See the License for the specific language governing permissions and
<string name="select_a_media_item">Select a media item</string>
<string name="media_route_provider_service">EasyCast Media Service</string>
<string name="media_route_menu_title"></string>
<string name="start">Start</string>
<string name="stop">Stop</string>

</resources>
1 change: 1 addition & 0 deletions settings.gradle
@@ -0,0 +1 @@

84 changes: 84 additions & 0 deletions src/com/laer/easycast/Device.java
@@ -0,0 +1,84 @@
package com.laer.easycast;

/**
* Created by Parth on 09-11-2014.
*/

import java.math.BigInteger;
import java.net.InetAddress;
import java.security.MessageDigest;
import java.util.logging.Level;
import java.util.logging.Logger;

/**
* Copyright (c) 2011 Carson McDonald
* <p/>
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* <p/>
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
* <p/>
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

public class Device {
private static Logger logger = Logger.getLogger(Device.class.getName());

private String id;
private String name;
private InetAddress inetAddress;
private int port;

public Device(String name, InetAddress inetAddress, int port) {
this.name = name;
this.inetAddress = inetAddress;
this.port = port;

try {
MessageDigest messageDigest = MessageDigest.getInstance("MD5");
messageDigest.update(inetAddress.getAddress());
messageDigest.update(String.valueOf(port).getBytes("UTF-8"));
id = String.format("%032X", new BigInteger(1, messageDigest.digest()));
} catch (Exception e) {
logger.log(Level.SEVERE, e.getMessage(), e);
throw new RuntimeException(e.getMessage(), e);
}
}

public String getName() {
return name;
}

public InetAddress getInetAddress() {
return inetAddress;
}

public int getPort() {
return port;
}

public String getId() {
return id;
}

@Override
public String toString() {
return "Device{" +
"id='" + getId() + '\'' +
", name='" + name + '\'' +
", inetAddress='" + inetAddress + '\'' +
", port=" + port +
'}';
}
}
67 changes: 67 additions & 0 deletions src/com/laer/easycast/DeviceCommand.java
@@ -0,0 +1,67 @@
package com.laer.easycast;

/**
* Created by Parth on 09-11-2014.
*/

import java.io.UnsupportedEncodingException;
import java.net.URLEncoder;
import java.util.HashMap;
import java.util.Map;
import java.util.logging.Level;
import java.util.logging.Logger;

/**
* Copyright (c) 2011 Carson McDonald
* <p/>
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* <p/>
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
* <p/>
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

public abstract class DeviceCommand {
private static Logger logger = Logger.getLogger(DeviceCommand.class.getName());
protected String requestType = "POST";
private Map<String, String> parameterMap = new HashMap<String, String>();

protected void addParameter(String name, Object value) {
parameterMap.put(name, value.toString());
}

protected String constructCommand(String commandName, String content) {
String parameterValue = parameterMap.keySet().size() == 0 ? "" : "?";
for (String key : parameterMap.keySet()) {
try {
parameterValue += key + "=" + URLEncoder.encode(parameterMap.get(key), "utf-8");
} catch (UnsupportedEncodingException e) {
logger.log(Level.SEVERE, e.getMessage(), e);
throw new RuntimeException(e.getMessage(), e);
}
}

String headerPart = String.format("%s /%s%s HTTP/1.1\n" +
"Content-Length: %d\n" +
"User-Agent: MediaControl/1.0\n", requestType, commandName, parameterValue, content == null ? 0 : content.length());
if (content == null || content.length() == 0) {
return headerPart;
} else {
return headerPart + "\n" + content;
}
}

public abstract String getCommandString();
}
110 changes: 110 additions & 0 deletions src/com/laer/easycast/DeviceConnection.java
@@ -0,0 +1,110 @@
package com.laer.easycast;

/**
* Created by Parth on 09-11-2014.
*/

import java.io.BufferedReader;
import java.io.BufferedWriter;
import java.io.IOException;
import java.io.InputStreamReader;
import java.io.OutputStreamWriter;
import java.net.Socket;
import java.util.logging.Level;
import java.util.logging.Logger;

/**
* Copyright (c) 2011 Carson McDonald
* <p/>
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* <p/>
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
* <p/>
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
* <p/>
* This class manages the connection to an AirPlay device.
*/
public class DeviceConnection {
private static Logger logger = Logger.getLogger(DeviceConnection.class.getName());

private Device device;
private Socket socket;

public DeviceConnection(Device device) {
this.device = device;
}

public void close() {
if (socket != null) {
try {
socket.close();
} catch (IOException e) {
// ignore anything here
}
}
}

public DeviceResponse sendCommand(DeviceCommand command) {
if (socket == null || socket.isClosed()) {
try {
socket = new Socket(device.getInetAddress(), device.getPort());
} catch (IOException e) {
logger.log(Level.SEVERE, e.getMessage(), e);
throw new RuntimeException(e.getMessage(), e);
}
}

try {
BufferedReader deviceInput = new BufferedReader(new InputStreamReader(socket.getInputStream()));
BufferedWriter deviceOutput = new BufferedWriter(new OutputStreamWriter(socket.getOutputStream()));

String commandString = command.getCommandString();
deviceOutput.write(commandString + "\n");
deviceOutput.flush();

StringBuffer fullResponse = new StringBuffer();
String partialResponse;
while (!(partialResponse = deviceInput.readLine().trim()).equals("")) {
fullResponse.append(partialResponse);
fullResponse.append("\n");
}

int contentLength = 0;
if (fullResponse.indexOf("Content-Length:") != -1) {
String cls = "Content-Length:";
int si = fullResponse.indexOf(cls);
int ei = fullResponse.indexOf("\n", si + cls.length());
contentLength = Integer.parseInt(fullResponse.substring(si + cls.length(), ei).trim());
}

StringBuffer content = null;
if (contentLength > 0) {
content = new StringBuffer(contentLength);
char buffer[] = new char[1024];
int read, totalRead = 0;
do {
read = deviceInput.read(buffer);
totalRead += read;
content.append(buffer, 0, read);
} while (read != -1 && totalRead < contentLength);
}

return new DeviceResponse(fullResponse.toString(), content == null ? null : content.toString());
} catch (IOException e) {
logger.log(Level.SEVERE, e.getMessage(), e);
throw new RuntimeException(e.getMessage(), e);
}
}
}
41 changes: 41 additions & 0 deletions src/com/laer/easycast/DeviceConnectionService.java
@@ -0,0 +1,41 @@
package com.laer.easycast;

/**
* Created by Parth on 09-11-2014.
*/

import java.util.HashMap;
import java.util.Map;

/**
* Copyright (c) 2011 Carson McDonald
* <p/>
* Permission is hereby granted, free of charge, to any person obtaining a copy
* of this software and associated documentation files (the "Software"), to deal
* in the Software without restriction, including without limitation the rights
* to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
* copies of the Software, and to permit persons to whom the Software is
* furnished to do so, subject to the following conditions:
* <p/>
* The above copyright notice and this permission notice shall be included in
* all copies or substantial portions of the Software.
* <p/>
* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
* IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
* FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
* AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
* LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
* OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
* THE SOFTWARE.
*/

public class DeviceConnectionService {
private static Map<String, DeviceConnection> deviceConnectionMap = new HashMap<String, DeviceConnection>();

public static DeviceConnection getConnection(Device device) {
if (!deviceConnectionMap.containsKey(device.getId())) {
deviceConnectionMap.put(device.getId(), new DeviceConnection(device));
}
return deviceConnectionMap.get(device.getId());
}
}

0 comments on commit 9c5a8a8

Please sign in to comment.