From bd6e41a92c9f52859061ff9aca0bfe0bd69b1ba9 Mon Sep 17 00:00:00 2001 From: Richard Yao Date: Sun, 10 Dec 2017 18:14:52 -0500 Subject: [PATCH] Add EWTN and Telecare to suggested channels These are a couple of my mother's favorite channels. They have a variety of content, including news, so I am marking them as news channels. I consider them to be no less news channels than those from the United States' big 3 broadcasters, which are considered to be news channels, despite only airing the news a fraction of the time. There are other channels in this genre that I could propose, but I do not feel like tracking down logos and urls for them, so I am limiting my first patch to these two. I am not a lawyer, but I believe that these streams are completely legal to distribute. They are both owned by non-profits that: 1. Want anyone to be able to watch their content 2. State that clearly on their website. 3. Make their content available free to watch on their websites. 4. Have streaming apps on at least 1 platform. I am suggesting that these channels use channel numbers 135 and 137 because that is what the local cable company uses. Also, the project's license is unclear. I had been very hesitant to upstream a patch to a project without clarification on the license used by the project. After some soul searching, I have decided to publish this patch under the terms of either the Apache 2.0 or MIT licenses. If the project lead wishes to fix the unclear licensing with a different OSS license, I would likely be happy to follow suit. However, this patch itself is so small that I doubt it qualifies for copyright protection, so the license under which I choose to release it is likely a moot point unless I start sending more patches. The irony of continuing to say that my changes are too small to qualify for copyright protection on my third proposed patch does not escape me. They probably do when all 3 patches are taken together, but I do not particularly care too much about the threshold at which copyright protection applies. I just want to stress the importance of having clear licensing and to urge Nick to adopt a clear license ASAP. Signed-off-by: Richard Yao --- .../cumulustv/model/SuggestedChannels.java | 20 ++++++++++++++++++- 1 file changed, 19 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/felkertech/cumulustv/model/SuggestedChannels.java b/app/src/main/java/com/felkertech/cumulustv/model/SuggestedChannels.java index 12fa11d..bd1b017 100644 --- a/app/src/main/java/com/felkertech/cumulustv/model/SuggestedChannels.java +++ b/app/src/main/java/com/felkertech/cumulustv/model/SuggestedChannels.java @@ -58,6 +58,24 @@ public class SuggestedChannels { .setName("TWiT.tv") .setNumber("133") .build(), + new JsonChannel.Builder() + .setGenres(TvContract.Programs.Genres.NEWS) + .setLogo("http://www.ewtn.com/images/ewtnLogo_new2016.png") + .setMediaUrl("http://ewtnmmd.mmdlive.lldns.net/ewtnmmd/a8d009b542d24f3faa63c1b" + + "d1c6620fb/manifest.m3u8") + .setName("EWTN") + .setNumber("135") + .setSplashscreen("http://www.ewtn.com/images/bg.jpg") + .build(), + new JsonChannel.Builder() + .setGenres(TvContract.Programs.Genres.NEWS) + .setLogo("https://upload.wikimedia.org/wikipedia/en/c/cf/TelecareTV_JPEG.jpg") + .setMediaUrl("http://nlds7.neulion.com/nlds/telecare/telecare/as/live/telecare" + + "_hd_1600_ipad.m3u8") + .setName("Telecare") + .setNumber("137") + .setSplashscreen("http://www.telecaretv.org/fls/24700/site_graphics/siteBg2.jpg") + .build(), new JsonChannel.Builder() .setLogo("http://static-cdn1.ustream.tv/i/channel/live/1_9600798,256x144,b:20" + "15071514.jpg") @@ -116,4 +134,4 @@ public static CumulusChannel[] getSuggestedChannels() { new CumulusChannel("902", "PHOENIXHD", "http://teleboy.customers.cdn.iptv.ch/1122/index.m3u8", ""), new CumulusChannel("903", "Sport 1 Germany", "http://streaming-hub.com/tv/i/sport1_1@97464/index_1300_av-p.m3u8?sd=10&rebase=on", ""), new CumulusChannel("904", "RTP International", "http://rtp-pull-live.hls.adaptive.level3.net/liverepeater/rtpi_5ch120h264.stream/livestream.m3u8", "") -*/ \ No newline at end of file +*/