Skip to content

Commit 9bbb2c9

Browse files
paulhiggspaulhiggs
authored
Merge branch 'master' into master
2 parents 8c55b03 + d092fbb commit 9bbb2c9

8 files changed

Lines changed: 108 additions & 95 deletions

File tree

‎frontend/android/js/channel.js‎

Lines changed: 22 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
Channel.prototype.getNowNext = function (callback) {
22
var self = this;
33
if (self.contentGuideURI) {
4-
$.get(
5-
self.contentGuideURI + "?sid=" + self.getServiceRef() + "&now_next=true",
6-
function (data) {
4+
NetworkRequest(self.contentGuideURI + "?sid=" + self.getServiceRef() + "&now_next=true", {
5+
success: function (data) {
76
var now_next = {};
87
var newPrograms = self.parseSchedule(data);
98
if (newPrograms.length > 0) {
@@ -25,8 +24,8 @@ Channel.prototype.getNowNext = function (callback) {
2524
callback.call();
2625
}
2726
},
28-
"text"
29-
);
27+
dataType: "text",
28+
});
3029
}
3130
};
3231

@@ -35,23 +34,25 @@ Channel.prototype.getSchedule = function (callback) {
3534
self.programs = [];
3635

3736
if (self.contentGuideURI) {
38-
$.get(
37+
NetworkRequest(
3938
self.contentGuideURI + "?sid=" + self.getServiceRef() + "&start=" + self.epg.start + "&end=" + self.epg.end,
40-
function (data) {
41-
var programData = self.parseSchedule(data);
42-
self.programs = [];
43-
for (var i = 0; i < programData.length; i++) {
44-
var program2 = new Program(programData[i], this.element_id + "_program_" + i, self);
45-
program2.bilingual = this.bilingual;
46-
program2.channelimage = this.image;
47-
program2.channel_streamurl = this.streamurl;
48-
self.programs.push(program2);
49-
}
50-
if (typeof callback == "function") {
51-
callback.call();
52-
}
53-
},
54-
"text"
39+
{
40+
success: function (data) {
41+
var programData = self.parseSchedule(data);
42+
self.programs = [];
43+
for (var i = 0; i < programData.length; i++) {
44+
var program2 = new Program(programData[i], this.element_id + "_program_" + i, self);
45+
program2.bilingual = this.bilingual;
46+
program2.channelimage = this.image;
47+
program2.channel_streamurl = this.streamurl;
48+
self.programs.push(program2);
49+
}
50+
if (typeof callback == "function") {
51+
callback.call();
52+
}
53+
},
54+
dataType: "text",
55+
}
5556
);
5657
}
5758
};

‎frontend/android/js/dvbi-mobile.js‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -304,9 +304,8 @@ function openProgramInfo(program) {
304304
}
305305

306306
function loadServicelist(list) {
307-
$.get(
308-
list,
309-
function (data) {
307+
NetworkRequest(list, {
308+
success: function (data) {
310309
serviceList = parseServiceList(data, null, supportedDrmSystems);
311310
if (serviceList.regions) {
312311
var selectable = 0;
@@ -324,8 +323,8 @@ function loadServicelist(list) {
324323
serviceListSelected();
325324
}
326325
},
327-
"text"
328-
).fail(function () {
326+
dataType: "text",
327+
}).fail(function () {
329328
$("#notification").text("Error loading service list. You can select a new service list from the settings.");
330329
$("#notification").show();
331330
setTimeout(function () {
@@ -570,9 +569,8 @@ function loadServicelistProviders(list, hideCloseButton, listElement) {
570569
} else {
571570
$("#close_service_providers").show();
572571
}
573-
$.get(
574-
list,
575-
function (data) {
572+
NetworkRequest(list, {
573+
success: function (data) {
576574
var providers = parseServiceListProviders(data);
577575
var servicelists = providers.providerList;
578576
if (!listElement) {
@@ -651,8 +649,8 @@ function loadServicelistProviders(list, hideCloseButton, listElement) {
651649
}
652650
}
653651
},
654-
"text"
655-
);
652+
dataType: "text",
653+
});
656654
}
657655

658656
function listSelected(list, keepRegion) {

‎frontend/android/player.html‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@
2727
<!-- <script src="https://cdn.dashjs.org/v5.0.0/modern/umd/dash.all.debug.js"></script> -->
2828
<script src="../../identifiers.js"></script>
2929
<script src="../../namespaces.js"></script>
30+
<script src="../network.js"></script>
3031
<script src="../channel-common.js"></script>
3132
<script src="../configuration.js"></script>
3233
<script src="../icon_manager.js"></script>

‎frontend/channel-common.js‎

Lines changed: 12 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -270,14 +270,17 @@ Channel.prototype.getServiceInstanceByCPSIndex = function (cpsIndex) {
270270
Channel.prototype.getMoreEpisodes = function (programId, callback) {
271271
var self = this;
272272
if (this.moreEpisodesURI && typeof callback == "function") {
273-
$.get(
274-
this.moreEpisodesURI + "?pid=" + programId + "&type=ondemand",
275-
function (data) {
273+
NetworkRequest({
274+
url: this.moreEpisodesURI + "?pid=" + programId + "&type=ondemand",
275+
success: function (data) {
276276
var episodes = self.parseSchedule(data);
277277
callback.call(callback, episodes);
278278
},
279-
"text"
280-
);
279+
datatype: "text",
280+
beforeSend: function (xhr) {
281+
xhr.setRequestHeader("Accept", "application/vnd.dvb.dvbi.r6");
282+
},
283+
});
281284
} else if (typeof callback == "function") {
282285
callback.call(null);
283286
}
@@ -286,18 +289,17 @@ Channel.prototype.getMoreEpisodes = function (programId, callback) {
286289
Channel.prototype.getProgramInfo = function (programId, callback) {
287290
var self = this;
288291
if (this.programInfoURI && typeof callback == "function") {
289-
$.get(
290-
this.programInfoURI + "?pid=" + programId,
291-
function (data) {
292+
NetworkRequest(this.programInfoURI + "?pid=" + programId, {
293+
success: function (data) {
292294
var episodes = self.parseSchedule(data);
293295
if (episodes.length > 0) {
294296
callback.call(callback, episodes[0]);
295297
} else {
296298
callback.call(null);
297299
}
298300
},
299-
"text"
300-
);
301+
dataType: "text",
302+
});
301303
} else if (typeof callback == "function") {
302304
callback.call(null);
303305
}

‎frontend/hbbtv/epg/channel.js‎

Lines changed: 41 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -10,48 +10,50 @@ EPGChannel.prototype.getSchedule = function (start, end, callback, earlier) {
1010

1111
if (self.contentGuideURI) {
1212
var offset = new Date().getTimezoneOffset() * 60;
13-
$.get(
13+
NetworkRequest(
1414
self.contentGuideURI + "?sid=" + self.getServiceRef() + "&start=" + (start + offset) + "&end=" + (end + offset),
15-
function (data) {
16-
//TODO use ContentGuideServiceRef from the service
17-
var j,
18-
programData = self.parseSchedule(data);
19-
var newPrograms = [];
20-
for (var i = 0; i < programData.length; i++) {
21-
var program2 = new EPGProgram(programData[i], self.element_id + "_program_" + i, self);
22-
program2.bilingual = self.bilingual;
23-
program2.channelimage = self.getImageSrc(self.image);
24-
program2.channel_streamurl = self.streamurl;
25-
newPrograms.push(program2);
26-
}
27-
if (newPrograms.length == 0) {
28-
var program0 = {};
29-
var programId = "no_program_" + start + "_" + end;
30-
program0.start = new Date(start * 1000);
31-
program0.end = new Date(end * 1000);
32-
program0.prglen = (program0.end.getTime() - program0.start.getTime()) / (1000 * 60);
33-
program0.title = "No programinfo available";
34-
var program = new EPGProgram(program0, self.element_id + "_no_program", self);
35-
program.bilingual = self.bilingual;
36-
program.channelimage = self.image;
37-
program.channel_streamurl = self.streamurl;
38-
program.noprogram = true;
39-
newPrograms.push(program);
40-
}
41-
if (earlier) {
42-
for (j = newPrograms.length - 1; j >= 0; j--) {
43-
self.programs.unshift(newPrograms[j]);
15+
{
16+
success: function (data) {
17+
//TODO use ContentGuideServiceRef from the service
18+
var j,
19+
programData = self.parseSchedule(data);
20+
var newPrograms = [];
21+
for (var i = 0; i < programData.length; i++) {
22+
var program2 = new EPGProgram(programData[i], self.element_id + "_program_" + i, self);
23+
program2.bilingual = self.bilingual;
24+
program2.channelimage = self.getImageSrc(self.image);
25+
program2.channel_streamurl = self.streamurl;
26+
newPrograms.push(program2);
4427
}
45-
} else {
46-
for (j = 0; j < newPrograms.length; j++) {
47-
self.programs.push(newPrograms[j]);
28+
if (newPrograms.length == 0) {
29+
var program0 = {};
30+
var programId = "no_program_" + start + "_" + end;
31+
program0.start = new Date(start * 1000);
32+
program0.end = new Date(end * 1000);
33+
program0.prglen = (program0.end.getTime() - program0.start.getTime()) / (1000 * 60);
34+
program0.title = "No programinfo available";
35+
var program = new EPGProgram(program0, self.element_id + "_no_program", self);
36+
program.bilingual = self.bilingual;
37+
program.channelimage = self.image;
38+
program.channel_streamurl = self.streamurl;
39+
program.noprogram = true;
40+
newPrograms.push(program);
4841
}
49-
}
50-
if (typeof callback == "function") {
51-
callback.call();
52-
}
53-
},
54-
"text"
42+
if (earlier) {
43+
for (j = newPrograms.length - 1; j >= 0; j--) {
44+
self.programs.unshift(newPrograms[j]);
45+
}
46+
} else {
47+
for (j = 0; j < newPrograms.length; j++) {
48+
self.programs.push(newPrograms[j]);
49+
}
50+
}
51+
if (typeof callback == "function") {
52+
callback.call();
53+
}
54+
},
55+
dataType: "text",
56+
}
5557
).fail(function () {
5658
var program0 = {};
5759
var programId = "no_program_" + start + "_" + end;

‎frontend/hbbtv/launcher/channel.js‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
Channel.prototype.getNowNext = function () {
22
var self = this;
33
if (self.contentGuideURI) {
4-
$.get(
5-
self.contentGuideURI + "?sid=" + self.getServiceRef() + "&now_next=true",
6-
function (data) {
4+
NetworkRequest(self.contentGuideURI + "?sid=" + self.getServiceRef() + "&now_next=true", {
5+
success: function (data) {
76
var epg = {};
87
var boxes = [];
98
var now_next = {};
@@ -203,8 +202,8 @@ Channel.prototype.getNowNext = function () {
203202
self.setOpen(true, focus);
204203
}
205204
},
206-
"text"
207-
);
205+
dataType: "text",
206+
});
208207
} else {
209208
self.center = 0;
210209
self.populate(null);

‎frontend/hbbtv/main.js‎

Lines changed: 8 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -134,9 +134,8 @@ function init() {
134134
}
135135

136136
function loadServicelistProviders(url, cancelAllowed) {
137-
$.get(
138-
url,
139-
function (data) {
137+
NetworkRequest(url, {
138+
success: function (data) {
140139
var providers = parseServiceListProviders(data);
141140
var servicelists = providers.providerList;
142141
var buttons = [];
@@ -267,8 +266,8 @@ function loadServicelistProviders(url, cancelAllowed) {
267266
cancelAllowed
268267
);
269268
},
270-
"text"
271-
);
269+
dataType: "text",
270+
});
272271
}
273272
function selectServiceList(servicelistXML) {
274273
var currentChannel = null;
@@ -494,13 +493,12 @@ function updateProggressbars() {
494493
}
495494

496495
function getServiceList(list, succesCallback, errorCallback) {
497-
$.get(
498-
list,
499-
function (data) {
496+
NetworkRequest(list, {
497+
success: function (data) {
500498
succesCallback(data);
501499
},
502-
"text"
503-
);
500+
dataType: "text",
501+
});
504502
}
505503

506504
function initClock() {

‎frontend/network.js‎

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
function NetworkRequest(url, settings) {
2+
// settings.accepts= { mycustomtype: "application/vnd.dvb.dvbi.r6" },
3+
4+
settings.beforeSend = function (req) {
5+
// Chrome:: Refused to set unsafe header "User-Agent"
6+
// req.setRequestHeader("User-Agent", "DVB-I/A177r6");
7+
req.setRequestHeader("Accept", "application/vnd.dvb.dvbi.r6");
8+
};
9+
10+
settings.url = url;
11+
return $.ajax(settings);
12+
}

0 commit comments

Comments
 (0)