diff options
Diffstat (limited to 'vdrmanager/de.bjusystems.vdrmanager/src/main/java')
4 files changed, 32 insertions, 2 deletions
diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/Preferences.java b/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/Preferences.java index d4aaab9..4d19d0e 100644 --- a/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/Preferences.java +++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/Preferences.java @@ -238,6 +238,15 @@ public class Preferences { * * @return port */ + public String getSvdrpHost() { + return getCurrentVdr().getSvdrpHost(); + } + + /** + * Gets the port + * + * @return port + */ public int getSvdrpPort() { return getCurrentVdr().getSvdrpPort(); } diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/Vdr.java b/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/Vdr.java index b7960d3..619bb9e 100644 --- a/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/Vdr.java +++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/Vdr.java @@ -193,6 +193,9 @@ public class Vdr { @DatabaseField(columnName = "stz") private String serverTimeZone = "Europe/Berlin"; + @DatabaseField(columnName="svdrpHost") + private String svdrpHost = ""; + @DatabaseField(columnName="svdrpPort") private int svdrpPort = 6419; @@ -601,6 +604,7 @@ public class Vdr { map.put("key_smarttvweb_port", smarttvwebPort); map.put("key_smarttvweb_recstream_method", smarttvwebType); map.put("key_remote_enable", enableRemote); + map.put("key_svdrp_host", svdrpHost); map.put("key_svdrp_port", svdrpPort); return map; } @@ -694,6 +698,7 @@ public class Vdr { smarttvwebPort= getInteger(map, "key_smarttvweb_port", 8000); smarttvwebType= get(map, "key_smarttvweb_recstream_method", "progressive"); enableRemote = getBoolean(map, "key_remote_enable", true); + svdrpHost = get(map, "key_svdrp_host", ""); svdrpPort = getInteger(map, "key_svdrp_port", 6419); } @@ -713,6 +718,14 @@ public class Vdr { this.smarttvwebType = smarttvwebType; } + public String getSvdrpHost() { + return svdrpHost; + } + + public void setSvdrpHost(String svdrpHost) { + this.svdrpHost = svdrpHost; + } + public int getSvdrpPort() { return svdrpPort; } diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/db/DBAccess.java b/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/db/DBAccess.java index f854204..0e529dc 100644 --- a/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/db/DBAccess.java +++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/data/db/DBAccess.java @@ -32,7 +32,7 @@ public class DBAccess extends OrmLiteSqliteOpenHelper { // any time you make changes to your database objects, you may have to // increase the database version // Version 3 since 0.6 - private static final int DATABASE_VERSION = 5; + private static final int DATABASE_VERSION = 6; private RuntimeExceptionDao<Vdr, Integer> vdrDAO = null; @@ -126,6 +126,10 @@ public class DBAccess extends OrmLiteSqliteOpenHelper { } + if (oldVersion < 6) { + getVdrDAO().executeRaw("ALTER TABLE `vdr` ADD COLUMN svdrpHost varchar"); + } + } catch (SQLException e) { Log.e(DBAccess.class.getName(), "Can't drop databases", e); throw new RuntimeException(e); diff --git a/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/remote/RemoteActivity.java b/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/remote/RemoteActivity.java index 254150e..7711a4a 100644 --- a/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/remote/RemoteActivity.java +++ b/vdrmanager/de.bjusystems.vdrmanager/src/main/java/de/bjusystems/vdrmanager/remote/RemoteActivity.java @@ -620,7 +620,11 @@ public class RemoteActivity extends Activity implements OnClickListener, View.On try { if (connection == null) { - connection = new Connection(Preferences.get().getHost(), Preferences.get().getSvdrpPort()); + String host = Preferences.get().getSvdrpHost(); + if (host == null || host.length() == 0) { + host = Preferences.get().getHost(); + } + connection = new Connection(host, Preferences.get().getSvdrpPort()); } send = connection.send(new HITK(hitk[0])); |