time to show volume info can be set (was same as OSD time out)

3 files changed, 133 insertions, 126 deletions

diff --git a/javascript/channels.js b/javascript/channels.js
index 19cf3b0..75b1273 100644
--- a/javascript/channels.js
+++ b/javascript/channels.js
@@ -62,7 +62,7 @@ channelsnames[31]="EDGE";
 channels[31]="S23.5E-3-3202-6111";
 channelsnames[32]="NPO Politiek/NPO Best";
 channels[32]="S23.5E-3-3202-6010";
-channelsnames[33]="NPO DOC";
+channelsnames[33]="NPO Doc";
 channels[33]="S23.5E-3-3202-6015";
 channelsnames[34]="NPO Zapp Xtra/NPO Humor TV";
 channels[34]="S23.5E-3-3202-6025";
@@ -90,7 +90,7 @@ channelsnames[47]="Vitaya";
 channels[47]="S23.5E-3-3222-21120";
 channelsnames[48]="Acht";
 channels[48]="S23.5E-3-3222-21122";
-channelsnames[49]="Regio BE";
+channelsnames[49]="EVENAAR";
 channels[49]="S23.5E-3-3202-6055";
 channelsnames[50]="DMAX";
 channels[50]="S19.2E-133-33-63";
@@ -148,26 +148,24 @@ channelsnames[76]="Drama";
 channels[76]="S28.2E-2-2006-6522";
 channelsnames[77]="CI";
 channels[77]="S28.2E-2-2025-4802";
-channelsnames[78]="Playboy TV";
-channels[78]="S28.2E-2-2301-52169";
-channelsnames[79]="History";
-channels[79]="S28.2E-2-2025-4653";
-channelsnames[80]="History +1 hour";
-channels[80]="S28.2E-2-2025-5003";
-channelsnames[81]="H2";
-channels[81]="S28.2E-2-2025-5721";
-channelsnames[82]="Nat Geo";
-channels[82]="S28.2E-2-2025-4805";
-channelsnames[83]="Nat Geo+1hr";
-channels[83]="S28.2E-2-2025-4806";
-channelsnames[84]="Nat Geo Wild";
-channels[84]="S28.2E-2-2025-4807";
-channelsnames[85]="Real Time";
-channels[85]="S13.0E-64511-5700-4324";
-channelsnames[86]="Real Time +1";
-channels[86]="S13.0E-64511-800-1469";
-channelsnames[87]="QLAR";
-channels[87]="S19.2E-133-33-76";
+channelsnames[78]="History";
+channels[78]="S28.2E-2-2025-4653";
+channelsnames[79]="History +1 hour";
+channels[79]="S28.2E-2-2025-5003";
+channelsnames[80]="H2";
+channels[80]="S28.2E-2-2025-5721";
+channelsnames[81]="Nat Geo";
+channels[81]="S28.2E-2-2025-4805";
+channelsnames[82]="Nat Geo+1hr";
+channels[82]="S28.2E-2-2025-4806";
+channelsnames[83]="Nat Geo Wild";
+channels[83]="S28.2E-2-2025-4807";
+channelsnames[84]="Real Time";
+channels[84]="S13.0E-64511-5700-4324";
+channelsnames[85]="Real Time +1";
+channels[85]="S13.0E-64511-800-1469";
+channelsnames[86]=".";
+channels[86]="S19.2E-133-33-76";
 channelsnames[90]="TV Oost";
 channels[90]="S23.5E-3-3211-20814";
 channelsnames[91]="Omrop Fryslan Televisie";
@@ -206,7 +204,7 @@ channelsnames[107]="Sky DramaRom";
 channels[107]="S28.2E-2-2012-5502";
 channelsnames[108]="Sky ScFi/Horror";
 channels[108]="S28.2E-2-2012-4304";
-channelsnames[109]="HarryPotter";
+channelsnames[109]="Sky Superhero";
 channels[109]="S28.2E-2-2012-5650";
 channelsnames[110]="Sky Select";
 channels[110]="S28.2E-2-2012-4306";
@@ -368,7 +366,7 @@ channelsnames[249]="True Drama";
 channels[249]="S28.2E-2-2110-53380";
 channelsnames[250]="True Ent";
 channels[250]="S28.2E-2-2110-53375";
-channelsnames[251]="True Christmas";
+channelsnames[251]="True Movies 1";
 channels[251]="S28.2E-2-2110-53320";
 channelsnames[252]="True Movies 2";
 channels[252]="S28.2E-2-2110-53325";
@@ -650,11 +648,11 @@ channelsnames[473]="Romance TV,Romance";
 channels[473]="S19.2E-133-15-38";
 channelsnames[474]="SAT.1 emotions";
 channels[474]="S19.2E-1-1015-4701";
-channelsnames[475]="Sky Sport News,SportNews";
+channelsnames[475]="Sky Sport News OBSOLETE,SportNews";
 channels[475]="S19.2E-133-3-17";
-channelsnames[476]="Disney Cinemagic,DisneyCin";
+channelsnames[476]="Disney Cinemagic OBSOLETE,DisneyCin";
 channels[476]="S19.2E-133-3-25";
-channelsnames[477]="MGM";
+channelsnames[477]="MGM OBSOLETE";
 channels[477]="S19.2E-133-3-515";
 channelsnames[478]="Sky Action OBSOLETE,Action";
 channels[478]="S19.2E-133-2-9";
@@ -670,9 +668,9 @@ channelsnames[483]="Sky Comedy OBSOLETE,Comedy";
 channels[483]="S19.2E-133-2-8";
 channelsnames[484]="Sky Emotion OBSOLETE,Emotion";
 channels[484]="S19.2E-133-2-20";
-channelsnames[485]="Sky Nostalgie,Nostalgie";
+channelsnames[485]="Sky Nostalgie OBSOLETE,Nostalgie";
 channels[485]="S19.2E-133-3-516";
-channelsnames[486]="Sky 007";
+channelsnames[486]="Sky 007 OBSOLETE";
 channels[486]="S19.2E-133-3-41";
 channelsnames[501]="ORF1";
 channels[501]="S19.2E-1-1117-13001";
@@ -732,7 +730,7 @@ channelsnames[550]="Rai Sport 1";
 channels[550]="S13.0E-318-5400-3305";
 channelsnames[551]="Rai Sport 2";
 channels[551]="S13.0E-318-5400-3301";
-channelsnames[552]="Eurosport Deutschland";
+channelsnames[552]="Eurosport 1 Deutschland";
 channels[552]="S19.2E-1-1091-31200";
 channelsnames[553]="SPORT1";
 channels[553]="S19.2E-133-33-900";
@@ -796,7 +794,7 @@ channelsnames[605]="Rock TV";
 channels[605]="S13.0E-64511-100-15333";
 channelsnames[606]="Retro Music TV";
 channels[606]="S23.5E-3-3205-5052";
-channelsnames[607]="JIM";
+channelsnames[607]="KADET";
 channels[607]="S23.5E-3-3222-21110";
 channelsnames[608]="MTV NL";
 channels[608]="S23.5E-3-3222-20947";
@@ -824,7 +822,7 @@ channelsnames[619]="NOW Music";
 channels[619]="S28.2E-2-2311-52010";
 channelsnames[620]="Flava";
 channels[620]="S28.2E-2-2110-53300";
-channelsnames[621]="Dancember";
+channelsnames[621]="Chartshw Dnce";
 channels[621]="S28.2E-2-2110-53315";
 channelsnames[622]="Starz TV";
 channels[622]="S28.2E-2-2110-53335";
@@ -2934,7 +2932,7 @@ channelsnames[4728]="DMC";
 channels[4728]="S13.0E-318-12200-7459";
 channelsnames[4729]="Miracle TV";
 channels[4729]="S13.0E-318-12200-7460";
-channelsnames[4730]="Al Forat";
+channelsnames[4730]="Al Forat OBSOLETE";
 channels[4730]="S13.0E-318-12200-7463";
 channelsnames[4731]="Al Fady";
 channels[4731]="S13.0E-318-12200-7464";
@@ -3114,90 +3112,92 @@ channelsnames[6017]="Penthouse";
 channels[6017]="S23.5E-3-3222-20917";
 channelsnames[6018]="Beate-Uhse.TV,BeateU";
 channels[6018]="S19.2E-133-17-21";
-channelsnames[6019]="PLAYBOY TV";
-channels[6019]="S19.2E-1-1060-30603";
-channelsnames[6020]="Playboy TV";
-channels[6020]="S13.0E-318-6100-7105";
-channelsnames[6021]="Penthouse CZ";
-channels[6021]="S23.5E-3-3222-20957";
-channelsnames[6022]="PENTHOUSE";
-channels[6022]="S19.2E-1-1086-9907";
-channelsnames[6023]="FRENCH LOVER";
-channels[6023]="S19.2E-1-1024-8501";
-channelsnames[6024]="LIBIDO TV";
-channels[6024]="S19.2E-1-1024-8504";
-channelsnames[6025]="PINK X";
-channels[6025]="S19.2E-1-1024-8508";
-channelsnames[6026]="Brazzers TV";
-channels[6026]="S19.2E-53-1119-12882";
-channelsnames[6027]="Hustler TV";
-channels[6027]="S19.2E-53-1119-12883";
-channelsnames[6028]="redhot 18s";
-channels[6028]="S28.2E-2-2092-55240";
-channelsnames[6029]="redhot amateur";
-channels[6029]="S28.2E-2-2092-55235";
-channelsnames[6030]="Television X";
-channels[6030]="S28.2E-2-2092-55231";
-channelsnames[6031]="redhot mums";
-channels[6031]="S28.2E-2-2092-55239";
-channelsnames[6032]="TVX Brits";
-channels[6032]="S28.2E-2-2092-55244";
-channelsnames[6033]="Climax";
-channels[6033]="S28.2E-2-2316-53592";
-channelsnames[6034]="ExGirlfriends";
-channels[6034]="S28.2E-2-2316-53597";
-channelsnames[6035]="XXX Mums";
-channels[6035]="S28.2E-2-2011-5708";
-channelsnames[6036]="XXX Brits";
-channels[6036]="S28.2E-2-2011-5710";
-channelsnames[6037]="XXXUniforms";
-channels[6037]="S28.2E-2-2019-5703";
-channelsnames[6038]="XXX Amateurs";
-channels[6038]="S28.2E-2-2019-4020";
-channelsnames[6039]="XXX Girl Girl";
-channels[6039]="S28.2E-2-2019-4021";
-channelsnames[6040]="xxx big&bouncy";
-channels[6040]="S28.2E-2-2019-4023";
-channelsnames[6041]="XXX 18 & Dirty";
-channels[6041]="S28.2E-2-2019-5704";
-channelsnames[6042]="DORCEL TV";
-channels[6042]="S19.2E-1-1110-9508";
-channelsnames[6043]="Vivid CZ";
-channels[6043]="S19.2E-53-1105-4065";
-channelsnames[6044]="XXL";
-channels[6044]="S19.2E-1-1094-17024";
-channelsnames[6045]="Hustler HD CZ";
-channels[6045]="S23.5E-3-3211-20831";
-channelsnames[6046]="Redlight";
-channels[6046]="S13.0E-318-5000-13760";
-channelsnames[6047]="Brazzers TV CZ";
-channels[6047]="S23.5E-3-3221-5069";
-channelsnames[6048]="Hustler TV CZ";
-channels[6048]="S19.2E-53-1119-12884";
-channelsnames[6049]="FL TV";
-channels[6049]="S13.0E-318-15400-13512";
-channelsnames[6050]="DORCEL XXX";
-channels[6050]="S19.2E-1-1096-8601";
-channelsnames[6051]="XXL";
-channels[6051]="S19.2E-1-1094-17054";
-channelsnames[6052]="Hustler HD";
-channels[6052]="S23.5E-3-3211-20830";
-channelsnames[6053]="XXL";
-channels[6053]="S13.0E-319-9900-468";
-channelsnames[6054]="Redlight HD!";
-channels[6054]="S13.0E-318-15800-16943";
-channelsnames[6055]="Hustler HD!";
-channels[6055]="S13.0E-318-15800-16944";
-channelsnames[6056]="XXL PL";
-channels[6056]="S13.0E-319-9900-469";
-channelsnames[6057]="Penthouse HD";
-channels[6057]="S23.5E-3-3236-5711";
-channelsnames[6058]="Penthouse HD1";
-channels[6058]="S23.5E-3-3236-5712";
-channelsnames[6059]="Penthouse HD2";
-channels[6059]="S23.5E-3-3236-5713";
-channelsnames[6060]="Penthouse 3D";
-channels[6060]="S23.5E-3-3204-5311";
+channelsnames[6019]="Xtreme Filth";
+channels[6019]="S28.2E-2-2102-54055";
+channelsnames[6020]="Viewers' Wives";
+channels[6020]="S28.2E-2-2102-54052";
+channelsnames[6021]="Television X";
+channels[6021]="S28.2E-2-2102-54050";
+channelsnames[6022]="Red Hot";
+channels[6022]="S28.2E-2-2102-54054";
+channelsnames[6023]="TVX Brits";
+channels[6023]="S28.2E-2-2102-54053";
+channelsnames[6024]="Climax";
+channels[6024]="S28.2E-2-2316-53592";
+channelsnames[6025]="ExGirlfriends";
+channels[6025]="S28.2E-2-2316-53597";
+channelsnames[6026]="FRENCH LOVER";
+channels[6026]="S19.2E-1-1024-8501";
+channelsnames[6027]="LIBIDO TV";
+channels[6027]="S19.2E-1-1024-8504";
+channelsnames[6028]="PINK X";
+channels[6028]="S19.2E-1-1024-8508";
+channelsnames[6029]="Playboy TV";
+channels[6029]="S28.2E-2-2301-52169";
+channelsnames[6030]="PLAYBOY TV";
+channels[6030]="S19.2E-1-1060-30603";
+channelsnames[6031]="Playboy TV";
+channels[6031]="S13.0E-318-6100-7105";
+channelsnames[6032]="Penthouse CZ";
+channels[6032]="S23.5E-3-3222-20957";
+channelsnames[6033]="PENTHOUSE";
+channels[6033]="S19.2E-1-1086-9907";
+channelsnames[6034]="Brazzers TV";
+channels[6034]="S19.2E-53-1119-12882";
+channelsnames[6035]="Hustler TV";
+channels[6035]="S19.2E-53-1119-12883";
+channelsnames[6036]="XXXUniforms";
+channels[6036]="S28.2E-2-2019-5703";
+channelsnames[6037]="XXX Brits";
+channels[6037]="S28.2E-2-2011-5710";
+channelsnames[6038]="XXX Mums";
+channels[6038]="S28.2E-2-2011-5708";
+channelsnames[6039]="XXX Amateurs";
+channels[6039]="S28.2E-2-2019-4020";
+channelsnames[6040]="XXX Girl Girl";
+channels[6040]="S28.2E-2-2019-4021";
+channelsnames[6041]="xxx big&bouncy";
+channels[6041]="S28.2E-2-2019-4023";
+channelsnames[6042]="XXX 18 & Dirty";
+channels[6042]="S28.2E-2-2019-5704";
+channelsnames[6043]="DORCEL TV";
+channels[6043]="S19.2E-1-1110-9508";
+channelsnames[6044]="Vivid CZ";
+channels[6044]="S19.2E-53-1105-4065";
+channelsnames[6045]="XXL";
+channels[6045]="S19.2E-1-1094-17024";
+channelsnames[6046]="Hustler HD CZ";
+channels[6046]="S23.5E-3-3211-20831";
+channelsnames[6047]="Redlight";
+channels[6047]="S13.0E-318-5000-13760";
+channelsnames[6048]="Brazzers TV CZ";
+channels[6048]="S23.5E-3-3221-5069";
+channelsnames[6049]="Hustler TV CZ";
+channels[6049]="S19.2E-53-1119-12884";
+channelsnames[6050]="FL TV";
+channels[6050]="S13.0E-318-15400-13512";
+channelsnames[6051]="DORCEL XXX";
+channels[6051]="S19.2E-1-1096-8601";
+channelsnames[6052]="XXL";
+channels[6052]="S19.2E-1-1094-17054";
+channelsnames[6053]="Hustler HD";
+channels[6053]="S23.5E-3-3211-20830";
+channelsnames[6054]="XXL";
+channels[6054]="S13.0E-319-9900-468";
+channelsnames[6055]="Redlight HD!";
+channels[6055]="S13.0E-318-15800-16943";
+channelsnames[6056]="Hustler HD!";
+channels[6056]="S13.0E-318-15800-16944";
+channelsnames[6057]="XXL PL";
+channels[6057]="S13.0E-319-9900-469";
+channelsnames[6058]="Penthouse HD";
+channels[6058]="S23.5E-3-3236-5711";
+channelsnames[6059]="Penthouse HD1";
+channels[6059]="S23.5E-3-3236-5712";
+channelsnames[6060]="Penthouse HD2";
+channels[6060]="S23.5E-3-3236-5713";
+channelsnames[6061]="Penthouse 3D";
+channels[6061]="S23.5E-3-3204-5311";
 channelsnames[8001]="NPO 1";
 channels[8001]="T-8720-2214-1101";
 channelsnames[8002]="NPO 2";
@@ -3352,7 +3352,7 @@ channelsnames[9017]="100% NL";
 channels[9017]="S23.5E-3-3211-20890";
 channelsnames[9018]="Arrow Jazz";
 channels[9018]="S19.2E-53-1097-2062";
-channelsnames[9019]="RTL 1440";
+channelsnames[9019]="Christliches Radio";
 channels[9019]="S19.2E-53-1105-4060";
 channelsnames[9020]="VRT Radio1";
 channels[9020]="S19.2E-53-1119-12778";
@@ -3426,7 +3426,7 @@ channelsnames[9505]="NPO Radio 4";
 channels[9505]="T-8720-2214-1115";
 channelsnames[9506]="NPO Radio 5";
 channels[9506]="T-8720-2214-1116";
-channelsnames[9507]="NPO Radio 6";
+channelsnames[9507]="NPO Soul & Jazz";
 channels[9507]="T-8720-2214-1117";
 channelsnames[9508]="FunX";
 channels[9508]="T-8720-2214-1119";
@@ -3489,7 +3489,7 @@ minChan[5] = 5001;
 maxChan[5] = 5100;
 baseChn[5] = 5000;
 minChan[6] = 6001;
-maxChan[6] = 6060;
+maxChan[6] = 6061;
 baseChn[6] = 6000;
 minChan[8] = 8001;
 maxChan[8] = 8059;
@@ -3508,4 +3508,4 @@ defChan[6] = minChan[6]; protChn[6] = 1;
 defChan[7] = minChan[7]; protChn[7] = 0;
 defChan[8] = minChan[8]; protChn[8] = 0;
 defChan[9] = minChan[9]; protChn[9] = 0;
-Chan_Ver = "12/10/15 22:56:11" ;
+Chan_Ver = "01/16/16 23:48:06" ;
diff --git a/javascript/main.js b/javascript/main.js
index e386284..08977aa 100644
--- a/javascript/main.js
+++ b/javascript/main.js
@@ -678,6 +678,7 @@ videoConfig = vos.getVideoConfiguration();
     // create the session
     session = vos.createVideoConfigurationSession();
     session.setDefaultVideoMode(videoConfig.getVideoOutputs()[currentOutput], desiredMode);
+//    session.SetDviMode(videoConfig.getVideoOutputs()[currentOutput], desiredMode);
     session.apply();
     session.releaseInstance();
 
@@ -1463,6 +1464,11 @@ function showOSD() {
 	opacity = 0.8;
 	OSD(opacity);
 	osdtimeout = setTimeout("fadeOut(); osdtimeout = 0;", ShowOsdTime);
+	if (Number(currChan) > 8999 && Number(currChan) < 10000) {
+		// show channel name
+	} else {
+		// not a radio channel so hide it
+	}
 }
 
 function epg_unactive() {
@@ -1478,7 +1484,7 @@ function showVolume() {
 	}
 	osdvolume.innerHTML = "<pre class=osdvolume" + cssres[css_nr][Set_Res] + ">" + Lang[1] + " : " + Volume + "% \n\uE007" + (new Array(Volume)).join("\uE008") + (new Array(100 - Volume)).join("\uE009") + "\uE00A";
 	osdvolume.style.opacity = 1;
-	osdVolumetimeout = setTimeout("osdvolume.style.opacity = 0;", ShowOsdTime);
+	osdVolumetimeout = setTimeout("osdvolume.style.opacity = 0;", ShowVolumeTime);
 }
 
 
diff --git a/javascript/settings.js b/javascript/settings.js
index cd41031..0c74dd4 100644
--- a/javascript/settings.js
+++ b/javascript/settings.js
@@ -2,7 +2,7 @@
 // Default settings
 // 
 
-var Version = "0.27";
+var Version = "0.28.01";
 
 //weather
 var city = "Almelo";
@@ -87,13 +87,14 @@ var fullupdate = 1; // If guideview is too slow, set it to 0 (for 1910/1960), fa
 // to force the use on boxes other then 19x3 use 2!!
 
 
-var ShowOsdTime = 5000; //Time to show OSD, in seconds * 1000
-var ShowSetTimer = 3000; //Time to show set timer popup, in seconds * 1000
-var ChangeTime = 1000; // Time before the channel change happens (was only with OK)
+var ShowOsdTime = 5 * 1000; //Time to show OSD, in seconds * 1000
+var ShowSetTimer = 3 * 1000; //Time to show set timer popup, in seconds * 1000
+var ChangeTime = 1 * 1000; // Time before the channel change happens (was only with OK)
 
 var serverEPGdays = 3 * (60 * 60 * 24); // the higher the longer you wait while getting the epg info
 
 var VolumeStep = 5; // Steps the volume buttons make
+var ShowVolumeTime = 1 * 1000; //Time to show Volume OSD, in seconds * 1000
 
 // Server for Recordings
 var recServ = ":" + "8000";