diff options
| author | Alib <aliboba@free.fr> | 2010-07-05 17:06:58 +0200 |
|---|---|---|
| committer | Alib <aliboba@free.fr> | 2010-07-05 17:06:58 +0200 |
| commit | 73d75c718b5017708065d0c39c73cded75062dac (patch) | |
| tree | 4b37764a45ccc6ece48cc7606e248fd0477f099a | |
| parent | ebddc115d8243b31b7309b1aebd45ceda4132690 (diff) | |
| download | istreamdev-73d75c718b5017708065d0c39c73cded75062dac.tar.gz istreamdev-73d75c718b5017708065d0c39c73cded75062dac.tar.bz2 | |
fix long path for pid checks
| -rwxr-xr-x | HISTORY | 2 | ||||
| -rwxr-xr-x | bin/istream.sh | 4 | ||||
| -rw-r--r-- | css/istreamdev.css | 2 | ||||
| -rwxr-xr-x | css/jqtouch.css | 2 | ||||
| -rwxr-xr-x[-rw-r--r--] | index.php | 0 | ||||
| -rw-r--r-- | js/istreamdev.js | 3 |
6 files changed, 8 insertions, 5 deletions
@@ -2,6 +2,8 @@ iStreamdev History ------------------ xx.xx.xxx - dev +- fix problem with long path for ffmpeg & segmenter binaries ( thx Mattes ) +- added some fix for ipad & ios4 - fixed some path & filename bug with special characters for music. - removed AT dependency diff --git a/bin/istream.sh b/bin/istream.sh index eb835e4..fdf6c66 100755 --- a/bin/istream.sh +++ b/bin/istream.sh @@ -63,7 +63,7 @@ sleep 1 FFPID=$! if [ ! -z "$FFPID" ] then - SPID=`\ps ax --format pid,cmd,ppid | grep "$FFPID$" | grep -v cat | awk {'print $1'}`; + SPID=`\ps ax --format "%p %c %P" | grep "$FFPID$" | grep -v cat | awk {'print $1'}`; if [ ! -z "$SPID" ] then echo $SPID > ./ffmpeg.pid @@ -79,7 +79,7 @@ sleep 1 SEGPID=$! if [ ! -z "$SEGPID" ] then - SPID=`\ps ax --format pid,cmd,ppid | grep "$SEGPID$" | grep segmenter | awk {'print $1'}`; + SPID=`\ps ax --format "%p %c %P" | grep "$SEGPID$" | grep segmenter | awk {'print $1'}`; if [ ! -z "$SPID" ] then echo $SPID > ./segmenter.pid diff --git a/css/istreamdev.css b/css/istreamdev.css index 4d1dd44..bec671a 100644 --- a/css/istreamdev.css +++ b/css/istreamdev.css @@ -25,7 +25,7 @@ color: #444; padding: 15px; border-top: 1px solid rgba(255,255,255,.2); display: block; -position: absolute; +position: fixed; left: 0; top: 0; width: 100%; diff --git a/css/jqtouch.css b/css/jqtouch.css index 5c3e736..3b8c8ed 100755 --- a/css/jqtouch.css +++ b/css/jqtouch.css @@ -370,4 +370,4 @@ div#jqt > .current { -webkit-transform: scale(.2); opacity: 0; } -}
\ No newline at end of file +} diff --git a/index.php b/index.php index 57d569e..57d569e 100644..100755 --- a/index.php +++ b/index.php diff --git a/js/istreamdev.js b/js/istreamdev.js index 09c3968..e5863c1 100644 --- a/js/istreamdev.js +++ b/js/istreamdev.js @@ -151,12 +151,13 @@ function reinitDivs() { $(document).ready(function(e){
$('div').bind('pageAnimationEnd', function(event, info){
if (info.direction == 'in') {
- $('#loader').removeClass("loader");
+ //$('#loader').removeClass("loader");
$(this).find('li[rel="toggle"]').show();
}
})
$('div').bind('pageAnimationStart', function(event, info){
+ $('#loader').removeClass("loader");
if (info.direction == 'in') {
$(this).find('li[rel="toggle"]').hide();
}
|