From 441d580b4d70ddc6c6f6f31c4bb851617166f0ea Mon Sep 17 00:00:00 2001 From: pidoubleyou Date: Sun, 4 Mar 2018 20:05:15 +0100 Subject: [PATCH 1/3] MDR-Livestreams korrigiert --- dist/live-streams.json | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/dist/live-streams.json b/dist/live-streams.json index 2f7ca6ed3..16a65e2a8 100644 --- a/dist/live-streams.json +++ b/dist/live-streams.json @@ -12,7 +12,9 @@ "X" : [ "DW", "Livestream", "DW Livestream", "", "", "", "", "", "http://dwstream72-lh.akamaihd.net/i/dwstream72_live@123556/master.m3u8", "http://www.ardmediathek.de/tv/live?kanal=Alle", "", "", "", "", "", "", "", "", "", "" ], "X" : [ "HR", "Livestream", "HR Livestream", "", "", "", "", "", "http://live1_hr-lh.akamaihd.net/i/hr_fernsehen@75910/master.m3u8", "http://www.ardmediathek.de/tv/live?kanal=Alle", "", "", "", "", "", "", "", "", "", "" ], "X" : [ "KiKA", "Livestream", "KiKA Livestream", "", "", "", "", "", "http://kikade-lh.akamaihd.net/i/livetvkika_de@450035/master.m3u8", "http://www.ardmediathek.de/tv/live?kanal=Alle", "", "", "", "", "", "", "", "", "", "" ], - "X" : [ "MDR", "Livestream", "MDR Livestream", "", "", "", "", "", "http://mdr_th_hls-lh.akamaihd.net/i/livetvmdrthueringen_de@106903/master.m3u8", "http://www.ardmediathek.de/tv/live?kanal=Alle", "", "", "", "", "", "", "", "", "", "" ], + "X" : [ "MDR", "Livestream", "MDR Sachsen Livestream", "", "", "", "", "", "http://mdrsnhls-lh.akamaihd.net/i/livetvmdrsachsen_de@513998/master.m3u8", "http://www.ardmediathek.de/tv/live?kanal=Alle", "", "", "", "", "", "", "", "", "", "" ], + "X" : [ "MDR", "Livestream", "MDR Sachsen-Anhalt Livestream", "", "", "", "", "", "http://mdrsahls-lh.akamaihd.net/i/livetvmdrsachsenanhalt_de@513999/master.m3u8", "http://www.ardmediathek.de/tv/live?kanal=Alle", "", "", "", "", "", "", "", "", "", "" ], + "X" : [ "MDR", "Livestream", "MDR Thüringen Livestream", "", "", "", "", "", "http://mdrthuhls-lh.akamaihd.net/i/livetvmdrthueringen_de@514027/master.m3u8", "http://www.ardmediathek.de/tv/live?kanal=Alle", "", "", "", "", "", "", "", "", "", "" ], "X" : [ "NDR", "Livestream", "NDR Livestream", "", "", "", "", "", "http://ndrfs-lh.akamaihd.net/i/ndrfs_nds@430233/master.m3u8", "http://www.ardmediathek.de/tv/live?kanal=Alle", "", "", "", "", "", "", "", "", "", "" ], "X" : [ "ORF", "Livestream", "ORF-1 Livestream", "", "", "", "", "", "http://apasfiisl.apa.at/ipad/orf1_q8c/orf.sdp/playlist.m3u8", "http://tvthek.orf.at/live", "", "", "", "", "", "", "", "", "", "" ], "X" : [ "ORF", "Livestream", "ORF-2 Livestream", "", "", "", "", "", "http://apasfiisl.apa.at/ipad/orf2_q8c/orf.sdp/playlist.m3u8", "http://tvthek.orf.at/live", "", "", "", "", "", "", "", "", "", "" ], From fd0aa558229cfcf8ca15b1242dfe4d581f5903c4 Mon Sep 17 00:00:00 2001 From: pidoubleyou Date: Sun, 4 Mar 2018 20:05:41 +0100 Subject: [PATCH 2/3] =?UTF-8?q?nicht=20mehr=20existenten=20Livestream=20f?= =?UTF-8?q?=C3=BCr=20ZDF=20Heute=20entfernt?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- dist/live-streams.json | 1 - 1 file changed, 1 deletion(-) diff --git a/dist/live-streams.json b/dist/live-streams.json index 16a65e2a8..be1c76266 100644 --- a/dist/live-streams.json +++ b/dist/live-streams.json @@ -27,6 +27,5 @@ "X" : [ "ZDF", "Livestream", "ZDF Livestream", "", "", "", "", "", "http://zdf1314-lh.akamaihd.net/i/de14_v1@392878/master.m3u8", "http://www.zdf.de/ZDFmediathek/hauptnavigation/live", "", "", "", "", "", "", "", "", "", "" ], "X" : [ "ZDF", "Livestream", "ZDF.info Livestream", "", "", "", "", "", "http://zdf1112-lh.akamaihd.net/i/de12_v1@392882/master.m3u8", "http://www.zdf.de/ZDFmediathek/hauptnavigation/live", "", "", "", "", "", "", "", "", "", "" ], "X" : [ "ZDF", "Livestream", "ZDF.neo Livestream", "", "", "", "", "", "http://zdf1314-lh.akamaihd.net/i/de13_v1@392877/master.m3u8", "http://www.zdf.de/ZDFmediathek/hauptnavigation/live", "", "", "", "", "", "", "", "", "", "" ], - "X" : [ "ZDF", "Livestream", "ZDF.heute Livestream", "", "", "", "", "", "http://zdf0102-lh.akamaihd.net/i/none01_v1@392849/master.m3u8", "http://www.zdf.de/ZDFmediathek/hauptnavigation/live", "", "", "", "", "", "", "", "", "", "" ], "X" : [ "PHOENIX", "Livestream", "PHOENIX Livestream", "", "", "", "", "", "http://zdf0910-lh.akamaihd.net/i/de09_v1@392871/master.m3u8", "http://www.zdf.de/ZDFmediathek/hauptnavigation/live", "", "", "", "", "", "", "", "", "", "" ] } From 834a8e4fe1f5b2f5fe141a9dfc2e657dfa9c50ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alexander=20Finkh=C3=A4user?= Date: Sun, 4 Mar 2018 22:23:45 +0100 Subject: [PATCH 3/3] Version auf 3.1.46 angehoben. --- build.gradle | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index fc54f69cd..3759d6b02 100644 --- a/build.gradle +++ b/build.gradle @@ -16,7 +16,7 @@ sourceCompatibility = 1.8 targetCompatibility = 1.8 group = 'de.mediathekview' archivesBaseName = "MServer" -version = '3.1.45' +version = '3.1.46' def jarName = 'MServer.jar' def mainClass = 'mServer.Main' @@ -39,7 +39,7 @@ repositories { mavenLocal() mavenCentral() maven { - url "https://oss.sonatype.org/content/repositories/snapshots/" + url "https://oss.sonatype.org/content/repositories/snapshots/" } }