3pp-mirror/snapcast
1
0
Fork 0
mirror of https://github.com/badaix/snapcast.git synced 2025-08-01 23:59:43 +02:00
Code Issues Projects Releases Packages Wiki Activity

toString returns json

Browse source
This commit is contained in:
badaix 2016-03-07 20:20:46 +01:00
parent 12a3015e35
commit 4a75aaf84b
10 changed files with 16 additions and 55 deletions
Download patch file Download diff file Expand all files Collapse all files

9
android/Snapcast/src/main/java/de/badaix/snapcast/control/json/Client.java
View file

@ -117,15 +117,10 @@ public class Client implements JsonSerialisable {
@Override
public String toString() {
return "Client{" +
"hots='" + host + '\'' +
", snapclient='" + snapclient + '\'' +
", config='" + config + '\'' +
", lastSeen=" + lastSeen +
", connected=" + connected +
'}';
return toJson().toString();
}
@Override
public boolean equals(Object o) {
if (this == o) return true;

7
android/Snapcast/src/main/java/de/badaix/snapcast/control/json/ClientConfig.java
View file

@ -80,12 +80,7 @@ public class ClientConfig implements JsonSerialisable {
@Override
public String toString() {
return "Client{" +
"name='" + name + '\'' +
", volume=" + volume +
", latency=" + latency +
", stream=" + stream +
'}';
return toJson().toString();
}
@Override

8
android/Snapcast/src/main/java/de/badaix/snapcast/control/json/Host.java
View file

@ -71,13 +71,7 @@ public class Host implements JsonSerialisable {
@Override
public String toString() {
return "Client{" +
"name='" + name + '\'' +
", mac='" + mac + '\'' +
", os='" + os + '\'' +
", arch='" + arch + '\'' +
", ip='" + ip + '\'' +
'}';
return toJson().toString();
}
@Override

5
android/Snapcast/src/main/java/de/badaix/snapcast/control/json/Server.java
View file

@ -57,10 +57,7 @@ public class Server implements JsonSerialisable {
@Override
public String toString() {
return "Server{" +
"host='" + host + '\'' +
", snapserver='" + snapserver + '\'' +
'}';
return toJson().toString();
}
@Override

5
android/Snapcast/src/main/java/de/badaix/snapcast/control/json/ServerStatus.java
View file

@ -50,6 +50,11 @@ public class ServerStatus implements JsonSerialisable {
return json;
}
@Override
public String toString() {
return toJson().toString();
}
public void clear() {
clients.clear();
streams.clear();

7
android/Snapcast/src/main/java/de/badaix/snapcast/control/json/Snapcast.java
View file

@ -63,12 +63,7 @@ public class Snapcast implements JsonSerialisable {
@Override
public String toString() {
return "Client{" +
"name='" + name + '\'' +
", version='" + version + '\'' +
", streamProtocolVersion=" + streamProtocolVersion +
", controlProtocolVersion=" + controlProtocolVersion +
'}';
return toJson().toString();
}
@Override

11
android/Snapcast/src/main/java/de/badaix/snapcast/control/json/Stream.java
View file

@ -3,9 +3,6 @@ package de.badaix.snapcast.control.json;
import org.json.JSONException;
import org.json.JSONObject;
import java.util.HashMap;
import java.util.Map;
/**
* Created by johannes on 06.01.16.
*/
@ -21,7 +18,7 @@ public class Stream implements JsonSerialisable {
@Override
public void fromJson(JSONObject json) {
try {
if (json.has("uri") && (json.get("uri") instanceof JSONObject)) {
if (json.has("uri") && (json.get("uri") instanceof JSONObject)) {
uri = new StreamUri(json.getJSONObject("uri"));
id = json.getString("id");
status = Status.fromString(json.getString("status"));
@ -98,11 +95,7 @@ public class Stream implements JsonSerialisable {
@Override
public String toString() {
return "Stream{" +
"uri='" + uri + '\'' +
", id='" + id + '\'' +
", status=" + status +
'}';
return toJson().toString();
}
public enum Status {

9
android/Snapcast/src/main/java/de/badaix/snapcast/control/json/StreamUri.java
View file

@ -144,13 +144,6 @@ public class StreamUri implements JsonSerialisable {
@Override
public String toString() {
return "Stream{" +
"raw='" + raw + '\'' +
", scheme='" + scheme + '\'' +
", host='" + host + '\'' +
", path='" + path + '\'' +
", fragment='" + fragment + '\'' +
", query=" + query +
'}';
return toJson().toString();
}
}

5
android/Snapcast/src/main/java/de/badaix/snapcast/control/json/Time_t.java
View file

@ -63,10 +63,7 @@ public class Time_t implements JsonSerialisable {
@Override
public String toString() {
return "Time_t{" +
"sec=" + sec +
", usec=" + usec +
'}';
return toJson().toString();
}
@Override

5
android/Snapcast/src/main/java/de/badaix/snapcast/control/json/Volume.java
View file

@ -63,10 +63,7 @@ public class Volume implements JsonSerialisable {
@Override
public String toString() {
return "Volume{" +
"muted=" + muted +
", percent=" + percent +
'}';
return toJson().toString();
}
@Override