diff options
| -rw-r--r-- | bin/session.php | 2 | ||||
| -rw-r--r-- | js/istreamdev.js | 8 |
2 files changed, 8 insertions, 2 deletions
diff --git a/bin/session.php b/bin/session.php index 9930a3d..0e42d0e 100644 --- a/bin/session.php +++ b/bin/session.php @@ -326,7 +326,7 @@ function sessiongetstatus($session, $prevmsg) } // Check session creation timeout - if ($checkstart && ((time() - $time) >= 10)) + if ($checkstart && ((time() - $time) >= 15)) { $status['status'] = "error"; $status['message'] = "Error: session could not start"; diff --git a/js/istreamdev.js b/js/istreamdev.js index e5863c1..d442ed4 100644 --- a/js/istreamdev.js +++ b/js/istreamdev.js @@ -51,6 +51,11 @@ jQT = new $.jQTouch({ $(document).ready(function(e){
dataString = "action=getGlobals";
showStatus( 0,"Getting configuration data" );
+ if ( navigator.userAgent.match(/iPad/i)) {
+ is_ipad = true;
+ } else {
+ is_ipad = false;
+ }
$.getJSON("bin/backend.php",
dataString,
function(data){
@@ -599,7 +604,8 @@ function playvideo(session,name) { streaming.find('ul[class="streamstatus"]').find('span[class="mode"]').html(message);
if ( status == "ready" || status == "error" ) {
streaming.find('#player').removeAttr("style");
- streaming.find('#player').html('<video id="videofeed" width="' + thumbwidth + '" height="' + thumbheight + '" poster="ram/session' + session + '/thumb.png?' + time + '" src="' + url + '" controls autoplay ></video><span rel="ready"></span>');
+ streaming.find('#player').html('<video id="videofeed" src="' + url + '" controls autoplay ></video><span rel="ready"></span>');
+
return false;
}
prevmsg = message;
|