Menu
▾
▴
[Easybox-mod-developeurs] SF.net SVN: easybox-mod: [153] trunk
|
From: <ara...@us...> - 2007-05-20 10:21:53
|
Revision: 153
http://svn.sourceforge.net/easybox-mod/?rev=153&view=rev
Author: aragornis
Date: 2007-05-20 03:21:51 -0700 (Sun, 20 May 2007)
Log Message:
-----------
- nouveau module stage6
- grosses modifs sur le module mp3 (beaucoup moins de rechargements de page)
- Mise au niveau du module "modules" avec gestion multipage
- Compteur de download dans Easybox pour les modules - avant seuls les modules t?\195?\169l?\195?\169charg?\195?\169s depuis le site ?\195?\169taient comptabilis?\195?\169s
- R?\195?\169solution du probl?\195?\168me de pause ?
- Correction d'un bug sur la r?\195?\169cup?\195?\169ration des acteurs par la biblioth?\195?\168que allocin?\195?\169
- Probl?\195?\168me temps clips dailymotion r?\195?\169gl?\195?\169
- Bouton "ajouter tout le dossier"
- Am?\195?\169lioration de ces icones
- Pas de changement de page quand on ajoute des fichiers audios ?\195?\160 la playlist
- Remodelage complet de la fa?\195?\167on de g?\195?\169rer la playlist audio, plus d'aller retour sur plein de pages : on reste ?\195?\160 sa page, que ce soit dans l'explorateur ou dans la biblioth?\195?\168que
- Possibilit?\195?\169 d'ajouter/jouer toute la biblioth?\195?\168que ou tout un dossier
- Possiblit?\195?\169 de supprimer tous les signets d'un film d'un seul coup
- Plus de plantage du module clip ?\195?\160 la fin d'un clip (?)
- Possibilit?\195?\169 d'annuler la demande d'arret d'un film
- Samplerate pass?\195?\169 ?\195?\160 44100 partout (signalez moi des probl?\195?\168mes de son sur le forum s'il y en a !)
- Possibilit?\195?\169 d'exclure un film du "scan auto" r?\195?\169par?\195?\169e
- R?\195?\169paration de la r?\195?\169cup?\195?\169ration du nom du r?\195?\169alisateur sans la biblioth?\195?\168que allocin?\195?\169
- Supprime la demande de r?\195?\169paration des index avi par vlc pour les fichiers stream?\195?\169s depuis internet
- Possiblit?\195?\169 de quitter le module vid?\195?\169o ?\195?\160 la fin m?\195?\170me pour un stream dont on ne connait pas la longueur par vlc : on transmet ?\195?\160 Easybox une valeur th?\195?\169orique qui sera utilis?\195?\169e (module stage6)
Modified Paths:
--------------
trunk/.htaccess
trunk/_framework/fonctions_partagees.inc.php
trunk/_framework/framework.php
trunk/_framework/lib/get_info.php
trunk/_utilisateur/modules.db
trunk/_utilisateur/rss.db
trunk/configuration/configmodif.php
trunk/http-vlc/lecteur/play-low.html
trunk/http-vlc/lecteur/play-wifi.html
trunk/http-vlc/lecteur/play.html
trunk/http-vlc/lecteur/set_option.html
trunk/module/_explorateur/explorateur.tpl
trunk/module/_explorateur/index1.php
trunk/module/clips/play_clip.php
trunk/module/dailymotion/index1.php
trunk/module/films/fichefilm.php
trunk/module/films/films.tpl
trunk/module/films/lecture.php
trunk/module/films/signet_ask.tpl
trunk/module/meteo/f2-france-512x384-j0pm.jpg
trunk/module/meteo/f2-france-512x384-j1am.jpg
trunk/module/meteo/f2-france-512x384-j1pm.jpg
trunk/module/meteo/f2-france-512x384-j2am.jpg
trunk/module/meteo/f2-france-512x384-j2pm.jpg
trunk/module/meteo/f2-france-512x384-j3am.jpg
trunk/module/meteo/f2-france-512x384-j3pm.jpg
trunk/module/meteo/fr.gif
trunk/module/modules/modules.tpl
trunk/module/mp3/catalogue.php
trunk/module/mp3/catalogue_audio.tpl
trunk/module/mp3/index1.php
trunk/module/mp3/lecteuraudio.php
trunk/module/mp3/paroles.php
trunk/module/mp3/playdb.php
trunk/module/mp3/playlist_audio.tpl
trunk/module/signet/signet.tpl
trunk/module/signet/supsignet.php
trunk/module/youtube/play_youtube.php
trunk/skin/mediacenter/interface/ajouter.gif
trunk/skin/mediacenter/interface/jouer.gif
trunk/skin/mediacenter/interface.tpl
trunk/skin/simple/interface/ajouter.gif
trunk/skin/simple/interface/jouer.gif
trunk/skin/simplegreen/interface/ajouter.gif
trunk/skin/simplegreen/interface/jouer.gif
trunk/version.html
Added Paths:
-----------
trunk/module/stage6/
trunk/module/stage6/icone.gif
trunk/module/stage6/index1.php
trunk/module/stage6/play_stage6.php
trunk/module/stage6/stage6.tpl
trunk/ressources/icones/Stage6.gif
trunk/skin/mediacenter/audio.tpl
Modified: trunk/.htaccess
===================================================================
--- trunk/.htaccess 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/.htaccess 2007-05-20 10:21:51 UTC (rev 153)
@@ -1 +1,2 @@
php_flag short_open_tag on
+AddType video/mp2v-es .mp2v
Modified: trunk/_framework/fonctions_partagees.inc.php
===================================================================
--- trunk/_framework/fonctions_partagees.inc.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/_framework/fonctions_partagees.inc.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -1,7 +1,7 @@
<?php
//Fonction permettant de lire un fichier
-function play_fichier($page,$basename, $realpath=1, $type='video', $name=''){
+function play_fichier($page,$basename, $realpath=1, $type='video', $name='', $duree=0){
global $ini,$USER;
if ($name==''){
$name=$basename;
@@ -12,6 +12,7 @@
fclose(fopen('http://127.0.0.1:8081/lecteur/'.$ini['multimedia']['qualite'].'?'.$page.'&mrl='.urlencode(addslashes($basename)), "r"));
}
save_variable('current_file',$name);
+save_variable('current_duree',$duree);
save_variable('current_type',$type);
}
@@ -793,4 +794,42 @@
function add_download($name){
echo @file_get_contents('http://www.easybox-mod.org/add_dl.php?name='.$name);
}
+
+function recharger_vlc(){
+global $smarty, $VLC, $contenu_html;
+//-- Test de l'activation de VLC
+ if(!$contenu_html = @file_get_contents("http://127.0.0.1:8081/_framework/vlc/temps2.html")){
+ echo'<center><br> <br> <br>Vlc n\'est pas lanc\xE9 ou il n\'\xE9coute pas le port 8081</center>';
+ }
+
+ //Extraction des donn\xE9es de vlc
+ $signetsav=explode("|",$contenu_html);
+ $temp1=explode(":",$signetsav[1]);
+ $temp2=explode(":",$signetsav[3]);
+
+ // Fichier lanc\xE9 selon la bdd
+ $VLC['db_current']=get_variable('current_file');
+ $VLC['type_current']=$VLC['db_current_type']=get_variable('current_type');
+ $VLC['duree_current']=$VLC['db_current_duree']=get_variable('current_duree');
+
+ // Variables d'environnement de VLC
+ $VLC['etat']=$signetsav[4]; // Playing,stop,pause
+ $VLC['url_current']=$signetsav[2]; // URL du fichier en cours de lecture
+ $VLC['name_current']=stripslashes($signetsav[5]); // Nom du fichier en cours de lecture
+ $VLC['duree_courante']=$temp1[0]*3600+60*$temp1[1]+$temp1[2]; // Temps \xE9coul\xE9 en secondes depuis le d\xE9but
+ $VLC['duree_totale']=$temp2[0]*3600+60*$temp2[1]+$temp2[2]; // Temps total en secondes
+ if($VLC['duree_current']>0 AND intval($VLC['duree_totale'])==0){
+ $VLC['duree_totale']=$VLC['duree_current']; // Remplacement de la dur\xE9e totale par un, th\xE9orique
+ }
+ $VLC['duree_restante']=$VLC['duree_totale']-$VLC['duree_courante']; // Temps restant en secondes
+
+
+
+
+ $VLC['pourcentage_courant']=round($VLC['duree_courante']/($VLC['duree_totale']+1)*100); // Pourcentage deja ecoule
+
+ // Mise \xE0 disposition des infos sur le fichier en cours aux templates
+ $smarty->assign('VLC',$VLC);
+
+}
?>
Modified: trunk/_framework/framework.php
===================================================================
--- trunk/_framework/framework.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/_framework/framework.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -1,8 +1,9 @@
<?php
//-- Test de l'activation de VLC
- if(!$contenu_html = @file_get_contents("http://127.0.0.1:8081/_framework/vlc/temps2.html")){
+/* if(!$contenu_html = @file_get_contents("http://127.0.0.1:8081/_framework/vlc/temps2.html")){
echo'<center><br> <br> <br>Vlc n\'est pas lanc\xE9 ou il n\'\xE9coute pas le port 8081</center>';
}
+*/
setlocale(LC_TIME, "fr");
@@ -112,13 +113,18 @@
$smarty->assign('OS',PHP_OS);
$smarty->register_modifier('cleanaff','supprime_accents');
+// Permet d'afficher une vid\xE9o mp2v en fond d'\xE9cran
+ $smarty->assign_by_ref('BODY_BACK',$BODY_BACK);
+
require_once($FRAMEWORK_REP."cartouche.php");
+recharger_vlc();
+/*
//Extraction des donn\xE9es de vlc
$signetsav=explode("|",$contenu_html);
$temp1=explode(":",$signetsav[1]);
$temp2=explode(":",$signetsav[3]);
-
+
// Variables d'environnement de VLC
$VLC['etat']=$signetsav[4]; // Playing,stop,pause
$VLC['url_current']=$signetsav[2]; // URL du fichier en cours de lecture
@@ -135,7 +141,8 @@
// Mise \xE0 disposition des infos sur le fichier en cours aux templates
$smarty->assign('VLC',$VLC);
-
+*/
+
// Level et nom de l'utilisateur
$userlevel = get_variable('level_user');
if($userlevel==''){
Modified: trunk/_framework/lib/get_info.php
===================================================================
--- trunk/_framework/lib/get_info.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/_framework/lib/get_info.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -141,12 +141,12 @@
$res['date_sortie'] = 2;
//R\xE9cup\xE9ration du r\xE9alisateur
- $ereg = '<h4>R\xE9alis\xE9 par <a class="link1" href=(.{1,150})>(.{1,40})<\/a><\/h4><h4> ';
+ $ereg = '<h4>R\xE9alis\xE9 par <a class="link1" href=(.{1,150})>(.{1,40})<\/a><\/h4><\/div>';
preg_match("/$ereg/s", $filmrecherche, $valeur);
$res['realisateur'] = $valeur[2];
//R\xE9cup\xE9ration des acteurs
- $ereg = '<h4>Avec(.{1,1000})<\/a><\/h4><\/div><div style="padding: 2 0 2 0;"><h4>Film';
+ $ereg = '<h4>Avec(.{1,1000}) <img src="http:\/\/a69\.g\.akamai.net\/n\/69\/10688\/v1\/img5\.allocine\.fr\/acmedia\/skin\/allocinev5\/puce\/fleche_bleue';
preg_match("/$ereg/s", $filmrecherche, $valeur);
$res['acteurs'] = trim(strip_tags($valeur[1]));
Modified: trunk/_utilisateur/modules.db
===================================================================
(Binary files differ)
Modified: trunk/_utilisateur/rss.db
===================================================================
(Binary files differ)
Modified: trunk/configuration/configmodif.php
===================================================================
--- trunk/configuration/configmodif.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/configuration/configmodif.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -71,6 +71,12 @@
<center><table widht="800" cellspacing="0" cellpadding="0"><tr><td align=center>';
$db = sqlite_open('../_utilisateur/video.db', 0666);
if($_REQUEST['id']!="" && $_REQUEST['name']!=""){
+ if($_REQUEST['auto']==1){
+ $bool3 = '0';
+ }else{
+ $bool3 = '1';
+ }
+ echo $bool3;
$sortie = mktime(0,0,0,$_REQUEST['moi'],$_REQUEST['jour'],$_REQUEST['an']);
$requete='
UPDATE film SET
@@ -87,7 +93,7 @@
production = \''.sqlite_escape_string($_REQUEST['production']).'\',
critique_visiteurs = \''.sqlite_escape_string($_REQUEST['notevis']).'\',
critique_presse = \''.sqlite_escape_string($_REQUEST['notecri']).'\',
- auto=\''.sqlite_escape_string($_REQUEST['auto']).'\' ,
+ auto=\''.$bool3.'\' ,
last_update=\''.time().'\'
WHERE ROWID = '.$_REQUEST['id'];
$result = sqlite_query($db,$requete);
@@ -116,6 +122,9 @@
}
$bool1[$entry['critique_visiteurs']] = 'selected';
$bool2[$entry['critique_presse']] = 'selected';
+ if($entry['auto']!=1){
+ $bool3 = 'checked';
+ }
echo'</select><br>
<br><u>R\xE9alisateur(s) (R\xE9alisateur1, r\xE9alisateur2, ...)</u><br>
<input type="text" style="border: thin outset;font-size: 9px;" name="realisateur" value="'.stripslashes($entry['realisateur']).'" size="'.(strlen($entry['realisateur'])+10).'"><br>
@@ -137,7 +146,7 @@
<textarea rows="5" style="border: thin outset;font-size: 12px;" cols="60" name="Synopsis">'.stripslashes($entry['Synopsis']).'</textarea><br>
<br><u>Url de l\'image</u><br>
<textarea rows="2" style="border: thin outset;font-size: 12px;" cols="60" name="img">'.stripslashes($entry['img']).'</textarea><br>
- <input type="checkbox" name="auto" value="1">Cochez cette case si vous ne voulez pas qu\'Easybox r\xE9cup\xE8re automatiquement des informations pour ce film et \xE9crase les donn\xE9es fournies
+ <input type="checkbox" name="auto" value="1" '.$bool3.'>Cochez cette case si vous ne voulez pas qu\'Easybox r\xE9cup\xE8re automatiquement des informations pour ce film et \xE9crase les donn\xE9es fournies
<br><br><center>
<a href="index1.php?page=55&get_info=1&id='.$_REQUEST['id'].'">Mettre \xE0 jour les informations depuis AlloCin\xE9 (en fonction du titre actuellement rentr\xE9)</a> - <a href="index1.php?page=55&get_info=-1&id='.$_REQUEST['id'].'">Effacer toutes les informations actuelles sur ce film</a><br>
<input type="submit" style="border: thin outset;font-size: 9px;" value="Mettre \xE0 jour les informations depuis AlloCin\xE9 avec la fiche du film ayant l\'id"> <input type="text" style="border: thin outset;font-size: 9px;" name="num_allocine" value=""><br>
Modified: trunk/http-vlc/lecteur/play-low.html
===================================================================
--- trunk/http-vlc/lecteur/play-low.html 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/http-vlc/lecteur/play-low.html 2007-05-20 10:21:51 UTC (rev 153)
@@ -13,43 +13,43 @@
<vlc id="if" param1="type value 1 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 normalement TV - Type 2 -->
<vlc id="if" param1="type value 2 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video jou\xE9 et transcod\xE9 avec sortie sur PC - Type 3 -->
<vlc id="if" param1="type value 3 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie sur PC - Type 4 -->
<vlc id="if" param1="type value 4 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video jou\xE9 et transcod\xE9 avec sortie en AC3 - Type 5 -->
<vlc id="if" param1="type value 5 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie en AC3 - Type 6 -->
<vlc id="if" param1="type value 6 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=1024 :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.65' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- messagerie audio - Type 7 -->
<vlc id="if" param1="type value 7 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- Fichiers photos -->
@@ -103,36 +103,36 @@
<vlc id="if" param1="type value 30 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd jou\xE9 normalement - sortie audio PC - Type 31 -->
<vlc id="if" param1="type value 31 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd jou\xE9 normalement - Sortie AC3 audio - Type 32 -->
<vlc id="if" param1="type value 32 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - transcodage audio - Type 33 -->
<vlc id="if" param1="type value 33 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - sortie audio PC - Type 34 -->
<vlc id="if" param1="type value 34 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - Sortie AC3 audio - Type 35 -->
<vlc id="if" param1="type value 35 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- MMS -->
Modified: trunk/http-vlc/lecteur/play-wifi.html
===================================================================
--- trunk/http-vlc/lecteur/play-wifi.html 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/http-vlc/lecteur/play-wifi.html 2007-05-20 10:21:51 UTC (rev 153)
@@ -13,43 +13,43 @@
<vlc id="if" param1="type value 1 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 normalement TV - Type 2 -->
<vlc id="if" param1="type value 2 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-acodec=mpga :sout-transcode-ab=128 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video jou\xE9 et transcod\xE9 avec sortie sur PC - Type 3 -->
<vlc id="if" param1="type value 3 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vb=2048 :sout-transcode-acodec=a52 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vb=2048 :sout-transcode-acodec=a52 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie sur PC - Type 4 -->
<vlc id="if" param1="type value 4 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-acodec=a52 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-acodec=a52 :sout-transcode-ab=128 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video jou\xE9 et transcod\xE9 avec sortie en AC3 - Type 5 -->
<vlc id="if" param1="type value 5 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajout\xE9 et transcod\xE9 avec sortie en AC3 - Type 6 -->
<vlc id="if" param1="type value 6 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=2048 :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay :sout-transcode-scale=0.80' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- messagerie audio - Type 7 -->
<vlc id="if" param1="type value 7 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- Fichiers photos -->
@@ -103,36 +103,36 @@
<vlc id="if" param1="type value 30 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd jou\xE9 normalement - sortie audio PC - Type 31 -->
<vlc id="if" param1="type value 31 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd jou\xE9 normalement - Sortie AC3 audio - Type 32 -->
<vlc id="if" param1="type value 32 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - transcodage audio - Type 33 -->
<vlc id="if" param1="type value 33 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=128 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - sortie audio PC - Type 34 -->
<vlc id="if" param1="type value 34 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=128 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajout\xE9 normalement - Sortie AC3 audio - Type 35 -->
<vlc id="if" param1="type value 35 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- MMS -->
Modified: trunk/http-vlc/lecteur/play.html
===================================================================
--- trunk/http-vlc/lecteur/play.html 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/http-vlc/lecteur/play.html 2007-05-20 10:21:51 UTC (rev 153)
@@ -13,36 +13,36 @@
<vlc id="if" param1="type value 1 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajoute et transcode normalement TV - Type 2 -->
<vlc id="if" param1="type value 2 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=mpga :sout-transcode-ab=256 :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video joue et transcode avec sortie sur PC - Type 3 -->
<vlc id="if" param1="type value 3 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajoute et transcode avec sortie sur PC - Type 4 -->
<vlc id="if" param1="type value 4 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-acodec=a52 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- audio/video joue et transcode avec sortie en AC3 - Type 5 -->
<vlc id="if" param1="type value 5 =" />
<vlc id="rpn" param1="vlc_stop" />
<vlc id="rpn" param1="playlist_empty" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add vlc_play" />
<vlc id="end" />
<!-- audio/video ajoute et transcode avec sortie en AC3 - Type 6 -->
<vlc id="if" param1="type value 6 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=0 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-vcodec=mp2v :sout-transcode-vb=4096 :sout-transcode-ab=512 :sout-transcode-channels=6 :sout-transcode-acodec=a52 :sout-transcode-samplerate=44100 :sout-transcode-vt=1000000 :sout-transcode-fps=25.0 :file-caching=1000 :sout-transcode-soverlay' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- messagerie audio - Type 7 -->
@@ -122,17 +122,17 @@
<!-- dvd ajoute normalement - transcodage audio - Type 33 -->
<vlc id="if" param1="type value 33 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=256 :sout-transcode-acodec=mpga :sout-transcode-channels=2 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajoute normalement - sortie audio PC - Type 34 -->
<vlc id="if" param1="type value 34 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout=#duplicate{dst=transcode:std,select=video,dst=display,select=audio} :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- dvd ajoute normalement - Sortie AC3 audio - Type 35 -->
<vlc id="if" param1="type value 35 =" />
- <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=0 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
+ <vlc id="rpn" param1="qfile value ' :sout=#transcode:std :sout-transcode-ab=512 :sout-transcode-acodec=a52 :sout-transcode-channels=6 :sout-transcode-samplerate=44100 :sout-transcode-soverlay :sout-transcode-vt=1000000 :sout-transcode-fps=25.0' strcat mrl value playlist_add" />
<vlc id="end" />
<!-- MMS -->
Modified: trunk/http-vlc/lecteur/set_option.html
===================================================================
--- trunk/http-vlc/lecteur/set_option.html 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/http-vlc/lecteur/set_option.html 2007-05-20 10:21:51 UTC (rev 153)
@@ -1,4 +1,5 @@
<!-- Modification de la sortie Audio - Type 0 -->
<vlc id="rpn" param1="'' 'sub-language' vlc_config_set"/>
<vlc id="rpn" param1="'' 'audio-language' vlc_config_set"/>
+ <vlc id="rpn" param1="'2' 'avi-index' vlc_config_set"/>
<vlc id="rpn" param1="vlc_config_save" />
Modified: trunk/module/_explorateur/explorateur.tpl
===================================================================
--- trunk/module/_explorateur/explorateur.tpl 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/_explorateur/explorateur.tpl 2007-05-20 10:21:51 UTC (rev 153)
@@ -98,8 +98,8 @@
{*######## Fin Affichage des raccourcis rapides ########*}
-{if !$_multipage.is_first_page}
- <tr><td colspan="2">{precedent}<font size="1"> <a href="{$PAGE_EXPLO}?start=0&directory={$REP|urlencode}&mode={$MODE}">D\xE9but du r\xE9pertoire</a></font></td></tr>
+{if !$_multipage.is_first_page}
+ <tr><td colspan="2">{precedent}<font size=1> - <a href="{$PAGE_EXPLO}?start=0&directory={$REP|urlencode}&mode={$MODE}">D\xE9but du r\xE9pertoire</a></font></td></tr>
{/if}
{if $Nb_rep_path >='2' AND $MIN==0}
@@ -143,13 +143,17 @@
{/if}
{/section}
- <tr><td colspan="2"><table><tr><td>{if !$_multipage.is_last_page}{suivant}<font size=1> - <a href="{$PAGE_EXPLO}?start={$_multipage.min_max}&directory={$REP|urlencode}&mode={$MODE}">Fin du r\xE9pertoire</a> - </font>{/if}{pagination}</td>
+ <tr><td colspan="2"><table width="498" border="0" cellpadding="0" cellspacing="0"><tr><td>{if !$_multipage.is_last_page}{suivant}<font size=1> - <a href="{$PAGE_EXPLO}?start={$_multipage.min_max}&directory={$REP|urlencode}&mode={$MODE}">Fin du r\xE9pertoire</a> - </font>{/if}{pagination}</td>
-<td width="30" align="center">
-{if $PLAYREP}
-<a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&type=playrep" onfocus='aide="{if $IS_DVD}Lire le dossier en tant que DVD{else}Lire le dossier en entier{/if}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/rep_all.gif" border="0" width="20" height="20"></td></tr></table></a>
+<td width="20">
+{if $MP3}
+ <a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&directory={$REP|urlencode}&start={$MIN}&mode=exp&type=playrep" onfocus='aide="Lire le dossier en entier";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}/jouer.gif" border="0" width="20" height="20"></td></tr></table></a>
+</td><td width="2"><img src="blank.gif" width="2" height="1"></td><td width="20">
+ <a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&directory={$REP|urlencode}&start={$MIN}&mode=exp&type=playrep&option=1" onfocus='aide="Ajouter le dossier en entier";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND2#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$INTERFACE_REP}/ajouter.gif" border="0" width="20" height="20"></td></tr></table></a>
+{elseif $PLAYREP}
+ <a href="{$PAGE_LECT_REP}?toplay={$REP|urlencode}&type=playrep" onfocus='aide="{if $IS_DVD}Lire le dossier en tant que DVD{else}Lire le dossier en entier{/if}";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/rep_all.gif" border="0" width="20" height="20"></td></tr></table></a>
{/if}
-</td><td width="30" align="center">
+</td><td width="2"><img src="blank.gif" width="2" height="1"></td><td width="20" align="center">
{if $AFF_FAVORIS}
<a href="{$RACINE_REP}module/favoris/index1.php?ajout={$REP|urlencode}&nom={$REP}" onfocus='aide="Ajouter le dossier aux favoris";'><table width="20" height="20" border="0" cellpadding="0" cellspacing="0" bgcolor="{#COULEUR_FOND1#}" abgcolor="{#COULEUR_ALINK#}"><tr height="20"><td align=center width="20" height="20" align="center" valign="middle"><img src="{$SKIN_REP}dossier/favoris.gif" border="0" width="20" height="20"></td></tr></table></a>
{/if}
Modified: trunk/module/_explorateur/index1.php
===================================================================
--- trunk/module/_explorateur/index1.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/_explorateur/index1.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -172,6 +172,10 @@
$min = ($_GET['page']-1)*14;
}
+if($lecteur_audio){
+ $option_liens = 'mode=exp&directory='.urlencode($rep).'&';
+}
+
$smarty->assign('AFF_CDDA',$aff_cdda=="1" && strlen($rep_copy)<=3 && (PHP_OS == "WIN32" || PHP_OS == "WINNT"));
$smarty->assign('AFF_LECTEUR',$dir_lecteur);
$smarty->assign('AFF_FAVORIS',$aff_favoris);
Modified: trunk/module/clips/play_clip.php
===================================================================
--- trunk/module/clips/play_clip.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/clips/play_clip.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -22,8 +22,9 @@
$url = 'http://launchtoday.fr.launch.yahoo.com/player/medialog.asp?vid='.$id.'&bw=510&mf=1&pid=505&ps=0&p1=2&p2=21&p3=2&rpid=35&pv=10&bp=Windows%2520NT&csid=791020104&uid=1886812234&pguid=einsJELEt4VkQCKMov00bg&etid=0&uguid=3e5u3891dirro&fcv=&mh='.$mh.'&z=ms.asx';
save_variable('backToURL', dirname($_SERVER['SCRIPT_NAME']).'/index1.php?show='.$_GET['show'].'&start='.$_GET['min'].'&lettre='.$_GET['lettre'].'&string='.$_GET['string']);
- play_fichier('type=40',$url,0,'backToURL');
-
+ //play_fichier('type=40',$url,0,'backToURL');
+ play_fichier('type=40','http://video.stage6.com/1198169/.divx',0,'backToURL');
+
$LINK['stop']=$MODULE.'films/lecture.php?control=stop';
$LINK['play']=$MODULE.'films/lecture.php?control=play';
$LINK['pause']=$MODULE.'films/lecture.php?control=pause';
@@ -45,7 +46,7 @@
<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2//EN">
<html>
<head>
-<meta name="refresh" content="0;url=../films/lecture.php">
+<meta name="refresh" content="8;url=../films/lecture.php">
<script language="javascript" src="/fb2ie.js">
</script>
</head>
Modified: trunk/module/dailymotion/index1.php
===================================================================
--- trunk/module/dailymotion/index1.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/dailymotion/index1.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -22,13 +22,9 @@
foreach($item->xpath('media:thumbnail') as $k){
$img = $k['url'];
}
- foreach($item->xpath('enclosure') as $k){
- $url = $k['url'];
- $length = intval($k['length']);
- }
$vid = $item->xpath('media:group/media:content');
- $retour[] = array('temps'=>date('i:s',$length), 'titre'=>utf8_decode($item->title), 'url'=>$vid[0]['url'], 'img'=>$img);
+ $retour[] = array('temps'=>date('i:s',intval($vid[0]['duration'])), 'titre'=>utf8_decode($item->title), 'url'=>$vid[0]['url'], 'img'=>$img);
}
}
return($retour);
Modified: trunk/module/films/fichefilm.php
===================================================================
--- trunk/module/films/fichefilm.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/films/fichefilm.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -93,7 +93,7 @@
}
}
- if(count($info['ba'])){
+ if(count($info['ba'])>0){
foreach($info['ba'] as $key=>$ba){
$t = explode(' - ',$ba['nom']);
$info['ba'][$key]['nom'] = stripslashes($t[1]);
Modified: trunk/module/films/films.tpl
===================================================================
--- trunk/module/films/films.tpl 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/films/films.tpl 2007-05-20 10:21:51 UTC (rev 153)
@@ -51,10 +51,16 @@
<select name=display_scaling>
<option value=letterbox>Letterbox
-<option value=panscan>Pan Scan
+<option value=panscan>Panscan
<option value=fullscreen>Fullscreen
</select>
-
+<br>
+<select name=display_aspect_ratio_conversion>
+<option value=letterbox>Letterbox
+<option value=combined>Combined
+<option value=panscan>Panscan
+<option value=ignore>Ignore
+</select>
<table width="500" align="left">
<tr><td width="90">Lumi\xE9re</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_brightness min=0 max=255 grad=16></td></tr>
<tr><td width="90">Contraste</td><td width="5">:</td><td><input bgcolor="{#COULEUR_FOND_RADIO#}" type=hslider name=denc_contrast min='-128' max=127 grad=16></td></tr>
Modified: trunk/module/films/lecture.php
===================================================================
--- trunk/module/films/lecture.php 2007-05-18 12:36:05 UTC (rev 152)
+++ trunk/module/films/lecture.php 2007-05-20 10:21:51 UTC (rev 153)
@@ -3,58 +3,45 @@
require($RACINE_REP.'_framework/framework.php');
$BACKGROUND = 'none';
$cansetfrontpannel = true;
-if($VLC['type_current']!='webtv' AND $VLC['duree_totale']>=5 AND $VLC['duree_restante']<=5)
-{
+
+
+if($VLC['type_current']!='webtv' AND $VLC['duree_totale']>=5){
set_refresh($VLC['duree_restante'], $VLC['duree_restante'].';url=lecture.php?control=stop&signet=noload&theend=1',true);
}
-
$META['front_panel'] = strtoupper($VLC['etat']);
-//Si aucune frame vid\xE9o n'est affich\xE9e :
-if($VLC['etat']=='Playing' OR $_REQUEST['control']=='pause'){
- $META['nopicture'] = '20;url=lecture.php?control=stop&signet=noload&errorload=1';
-}else{
- $META['nopicture'] = 'none';
-}
-
$affiche ="";
-if (isset($_REQUEST['control']))
-{
- if($_REQUEST['control']=='stop')
- {
- if($_REQUEST['theend'])
- {
+if (isset($_REQUEST['control'])){
+
+ if($_REQUEST['control']=='stop'){
+
+ if($_REQUEST['theend']){
$message='Le fichier est termin\xE9...<br>';
- } elseif($_REQUEST['errorload'])
- {
+ }elseif($_REQUEST['errorload']){
$message='Il y a eu une erreur lors du chargement. Le fichier ou flux semble indisponible ou la freebox n\'arrive pas \xE0 l\'afficher...<br>';
}
- if($VLC['type_current']=="ba")
- {
+ if($VLC['type_current']=="ba"){
$message .= 'Redirection vers la fiche du film...';
set_refresh(0,'0;url='.$RACINE_REP.'module/films/fichefilm.php?film='.urlencode(get_variable('fiche_film')));
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($VLC['type_current']=="jt")
- {
+ }elseif($VLC['type_current']=="jt"){
$message .= 'Redirection vers le menu des JT...';
- set_refresh(2,'2;url='.page_retour_film(),true);
+ set_refresh(1,'1;url='.page_retour_film(),true);
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($VLC['type_current']=="ba_allocine") // __JF
- {
+ }elseif($VLC['type_current']=="ba_allocine"){
$message .= 'Redirection vers les bandes annonces...';
- set_refresh(0,'0;url='.$RACINE_REP.'module/allocine/index1.php?start='.get_variable('start'));
+ set_refresh(1,'1;url='.$RACINE_REP.'module/allocine/index1.php?start='.get_variable('start'));
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($VLC['type_current']=="backToURL") {// __JF
+ }elseif($VLC['type_current']=="backToURL"){
$message .= 'Redirection vers la page pr\xE9c\xE9dente...';
- set_refresh(0,'0;url='.get_variable('backToURL'));
+ set_refresh(1,'1;url='.get_variable('backToURL'));
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($VLC['type_current']=="dvd") {
+ }elseif($VLC['type_current']=="dvd"){
$message .= 'Redirection vers les DVD...';
- set_refresh(2,'2;url='.page_retour_film(),true);
+ set_refresh(1,'1;url='.page_retour_film(),true);
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($_GET['signet'] == "load")
- {
+ }elseif($_GET['signet'] == "load"){
$db = sqlite_open($USER.'utilisateur.db', 0666);
$requete='INSERT INTO signet VALUES(NULL,
\''.sqlite_escape_string($signetsav[2]).'\',
@@ -64,24 +51,19 @@
$message.= 'Un signet pour le fichier en cours a \xE9t\xE9 enregistr\xE9. Pour reprendre la lecture du film ult\xE9rieurement, rendez-vous dans la section signets ! <br><br>';
$message.= 'Film : '.$signetsav[2].'<br><br>Temps : '.$signetsav[1].'<br><br>';
$message.= 'Redirection vers vos fichiers vid\xE9os...';
-
sqlite_close($db);
set_refresh(2,'2;url='.page_retour_film(),true);
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif ($_GET['signet'] == "noload")
- {
+ }elseif ($_GET['signet'] == "noload"){
$message .= 'Redirection vers vos fichiers vid\xE9os...';
set_refresh(2,'2;url='.page_retour_film(),true);
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } elseif($VLC['type_current']=="webtv")
- {
+ }elseif($VLC['type_current']=="webtv"){
$message .= 'Redirection vers les Webtv...';
set_refresh(2,'2;url='.page_retour_film(),true);
$file1 = file_get_contents('http://127.0.0.1:8081/lecteur/action.html?control='.$_REQUEST['control']);
- } else
- {
- // Micht : Utilisation d'une page de skin
+ }else{
$message = $smarty->fetch('signet_ask.tpl');
}
} elseif($_REQUEST['control']!='seek')
@@ -93,6 +75,15 @@
}
}
+/*
+//Si aucune frame vid\xE9o n'est affich\xE9e :
+if($VLC['etat']=='Playing' OR ($VLC['etat']=='Playing' AND $_REQUEST['control']=='pause')){
+ $META['nopicture'] = '20;url=lecture.php?control=stop&signet=noload&errorload=1';
+}else{
+ $META['nopicture'] = '';
+}
+*/
+
//Affiche les r\xE9sultats du livescore
if(get_variable('surv_page')!='' AND get_variable('surv_match')!='' AND (get_variable('last_timestamp')+30)<time())
{
@@ -158,9 +149,6 @@
set_refresh(60,'60;url=lecture.php');
}
-
-
-
//Enregistrer un signet
if($_GET['savesignet']==1)
{
@@ -170,8 +158,7 @@
}
//-- Avancer ou reculer
-if (isset($_REQUEST['seek_value']))
-{
+if (isset($_REQUEST['seek_value'])){
if($_REQUEST['seek_value']=="moins")
{
$value='-1m';
@@ -195,32 +182,20 @@
}
// Gestion des sous-titres
-if(isset($_REQUEST['next_ss']) or isset($_REQUEST['newfichier']))
-{
+if(isset($_REQUEST['next_ss']) or isset($_REQUEST['newfichier'])){
$sstitre=array();
+ eval(file_get_contents('http://localhost:8081/lecteur/options_vlc.html'));
- //-- R\xE9cuperation des donn\xE9es de VLC
- $page = @fopen ('http://localhost:8081/lecteur/options_vlc.html', 'r');
- $contenu_html = '';
- while (!feof ($page))
- {
- $contenu_html .= trim(fgets($page, 4096));
- }
- eval($contenu_html);
$n_sstitre = count($sstitre);
- if ($n_sstitre == '0')
- {
+ if ($n_sstitre == '0'){
$OSD .= "Pas de Sous-Titre";
$act = "non";
- } else
- {
+ }else{
$nn = '1';
- foreach ($sstitre as $key => $value)
- {
+ foreach ($sstitre as $key => $value){
$keysst[$nn] = $key;
$nomsst[$nn] = $value[0];
- if ($value[1] == '1')
- {
+ ...
[truncated message content] |
