Changeset 43055c96af0ccb6b70a449eba96bb2a2327a0194

Timestamp:

04/06/08 19:00:26 (4 months ago)

Author:

Antoine Cellerier <dionoea@videolan.org>

git-committer:

Antoine Cellerier <dionoea@videolan.org> 1207501226 +0200

git-parent:

[4845f3da5342643c9b2d48d6a0acb4ee3e406cbb]

git-author:

Antoine Cellerier <dionoea@videolan.org> 1207253473 +0200

Message:

Change input item options handling in the lua http interface. Fixes normal playlist mode option handling. The VLM part most likely needs to be fixed.

Files:

• share/lua/http/dialogs/input (modified) (1 diff)
• share/lua/http/dialogs/sout (modified) (2 diffs)
• share/lua/http/flash.html (modified) (1 diff)
• share/lua/http/js/functions.js (modified) (9 diffs)
• share/lua/http/requests/status.xml (modified) (2 diffs)
• share/lua/intf/http.lua (modified) (2 diffs)

share/lua/http/dialogs/input

@@ -33 +33 @@
-  </div>
-  <div class="controls">
- (MRL)
+
-    <?vlc if current_page == "vlm" then ?>
-      <input type="text" name="input_mrl" id="input_mrl" size="60" onkeypress="if( event.keyCode == 13 ) vlm_input_change();"/>
+    <?vlc else ?>
+      <input type="text" name="input_mrl" id="input_mrl" size="60" onkeypress="if( event.keyCode == 13 ) in_play();"/>
+    <?vlc end ?>
+    <div>
+    Options
+    <!-- <input type="button" value="Refresh options" onclick="refresh_input_options_list();" /> -->
+    <input type="button" value="Add option" onclick="add_input_option(':option=value');" />
+    <div id="input_options_list"></div>
+    </div>
+    <?vlc if current_page == "vlm" then ?>
-      <input type="button" value="Ok" onclick="vlm_input_change();" />
-      <input type="button" value="Cancel" onclick="hide('input');" />
-      <input type="hidden" id="input_dest" value="" />
-    <?vlc else ?>
-      <input type="text" name="input_mrl" id="input_mrl" size="60" onkeypress="if( event.keyCode == 13 ) in_play();"/>
-      <input type="button" value="Play" onclick="in_play();" />
-      <input type="button" value="Enqueue" onclick="in_enqueue();" />

share/lua/http/dialogs/sout

@@ -34 +34 @@
-  </div>
-  <div class="controls">
- (MRL)
+
-    <?vlc if current_page == "vlm" then ?>
-
+ disabled="disabled" 
-      <br/>
-      <input type="button" value="Ok" onclick="vlm_output_change();" />
@@ -42 +42 @@
-      <input type="hidden" id="sout_dest" />
-    <?vlc else ?>
-
+disabled="disabled" 
-      <br/>
-      <input type="button" value="Save" onclick="save_sout();" />

share/lua/http/flash.html

@@ -14 +14 @@
-// <![CDATA[
-host = document.location.toString().replace( /http:\/\//, '' ).replace( /[:/].*/, '' );
+input_options.push( ":sout=#transcode{vcodec=FLV1,acodec=mp3,channels=2,samplerate=44100}:std{access=http,mux=ffmpeg{mux=flv},dst=0.0.0.0:8081/stream.flv}" );
+input_options.push( ":no-sout-keep" );
-// ]]>
-</script>
-</head>
-
-
+ refresh_input_options_list();
-<?vlc
-current_page = "index"
-dialogs("browse","main","input","playlist") ?>
-
-  <input id="sout_mrl" type="hidden" value=":sout=#transcode{vcodec=FLV1,acodec=mp3,channels=2,samplerate=44100}:std{access=http,mux=ffmpeg{mux=flv},dst=0.0.0.0:8081/stream.flv} :no-sout-keep" />
-
-  <div style='height: 100%; width: 100%; text-align: center;'>

share/lua/http/js/functions.js

@@ -37 +37 @@
-var slider_dx = 0;
-
+var input_options = new Array();
+
-/* findPosX() from http://www.quirksmode.rg/js/indpos.html */
-function findPosX(obj)
@@ -284 +286 @@
- *********************************************************************/
-/* input actions */
-(
+enqueue( cmd 
-{
-    var input = value('input_mrl');
-
-
-
+
+
+
+
-    loadXMLDoc( url, parse_status );
-    setTimeout( 'update_playlist()', 1000 );
-}
+
+function in_play()
+{
+    in_playenqueue( 'play' );
+}
+
-function in_enqueue()
-{
-
-
-
-
-
-
+
-}
-
@@ -772 +776 @@
-    }
-
+    remove_input_options( ':sub-track' );
+    remove_input_options( ':audio-track' );
+
-    if( type != "cdda" )
-    {
-        if( subs != '' )
-mrl.value += " :sub-track="+subs
+add_input_option( ":sub-track="+subs )
-        if( audio != '' )
-mrl.value += " :audio-track="+audio
+add_input_option( ":audio-track="+audio )
-    }
-
@@ -826 +833 @@
-    }
-
+    remove_input_options( ':access-filter' );
-    if( checked( "input_net_timeshift" ) )
-mrl.value += " :access-filter=timeshift"
+add_input_option( ":access-filter=timeshift" )
-}
-
@@ -833 +841 @@
-function update_input_fake()
-{
+    remove_input_options( ":fake" );
-    var mrl = document.getElementById( 'input_mrl' );
-
-    mrl.value = "fake:";
-
+
+
-
-    if( value( "input_fake_width" ) )
-mrl.value += " :fake-width=" + value( "input_fake_width"
+add_input_option( ":fake-width=" + value( "input_fake_width" )
-    if( value( "input_fake_height" ) )
-mrl.value += " :fake-height=" + value( "input_fake_height"
+add_input_option( ":fake-height=" + value( "input_fake_height" )
-    if( value( "input_fake_ar" ) )
-mrl.value += " :fake-ar=" + value( "input_fake_ar"
+add_input_option( ":fake-ar=" + value( "input_fake_ar" )
-}
-
@@ -868 +878 @@
-function update_sout()
-{
-
-
+
+
+
+
-
-    check_and_replace_int( 'sout_http_port', 8080 );
@@ -893 +905 @@
-    if( transcode )
-    {
-mrl.value +
+option 
-        var alot = false; /* alot == at least one transcode */
-        if( checked( 'sout_vcodec_s' ) )
-        {
-mrl.value
+option
-            alot = true;
-        }
-        if( checked( 'sout_acodec_s' ) )
-        {
-mrl.value
-mrl.value
+option
+option
-            if( value( 'sout_channels' ) )
-mrl.value
+option
-            alot = true;
-        }
-        if( checked( 'sout_soverlay' ) )
-        {
-mrl.value
-mrl.value
+option
+option
-            alot = true;
-        }
-        else if( checked( 'sout_sub' ) )
-        {
-mrl.value
-mrl.value
+option
+option
-            alot = true;
-        }
-mrl.value
+option
-            
-
+
+
-    }
-
@@ -932 +945 @@
-    {
-        if( transcode )
-mrl.value
+option
-        else
-mrl.value
+option
-        var aloo = false; /* aloo == at least one output */
-        var mux = radio_value( 'sout_mux' );
-        var ttl = parseInt( value( 'sout_ttl' ) );
-mrl.value
+option
-        if( checked( 'sout_display' ) )
-        {
-mrl.value
-mrl.value
+option
+option
-            aloo = true;
-        }
-        if( checked( 'sout_file' ) )
-        {
-mrl.value
-mrl.value
-mrl.value
+option
+option
+option
-            aloo = true;
-        }
-        if( checked( 'sout_http' ) )
-        {
-mrl.value
-mrl.value
-mrl.value
+option
+option
+option
-            if( value( 'sout_http_port' ) )
-mrl.value
-mrl.value
+option
+option
-            aloo = true;
-        }
-        if( checked( 'sout_mmsh' ) )
-        {
-mrl.value
-mrl.value
-mrl.value
+option
+option
+option
-            if( value( 'sout_mmsh_port' ) )
-mrl.value
-mrl.value
+option
+option
-            aloo = true;
-        }
-        if( checked( 'sout_rtp' ) )
-        {
-mrl.value
-mrl.value
-mrl.value
-mrl.value
-mrl.value
+option
+option
+option
+option
+option
-            if( value( 'sout_rtp_port' ) )
-mrl.value
+option
-            if( checked( 'sout_sap' ) )
-            {
-mrl.value
+option
-                if( value( 'sout_sap_group' ) != '' )
-                {
-mrl.value
+option
-                }
-mrl.value
-
-mrl.value
+option
+
+option
-            aloo = true;
-        }
-        if( checked( 'sout_udp' ) )
-        {
-mrl.value
-mrl.value
-mrl.value
-mrl.value
-mrl.value
+option
+option
+option
+option
+option
-            if( value('sout_udp_port' ) )
-mrl.value
+option
-            if( checked( 'sout_sap' ) )
-            {
-mrl.value
+option
-                if( value( 'sout_sap_group' ) != '' )
-                {
-mrl.value
+option
-                }
-mrl.value
-
-mrl.value
+option
+
+option
-            aloo = true;
-        }
-
-
+
+
+
+
+
-
-    if( ( transcode || output ) && checked( 'sout_all' ) )
-
+
+
+
+
+
+
-}
-
@@ -1032 +1053 @@
-    document.getElementById('sout_old_mrl').value = value('sout_mrl');
-}
+
+function refresh_input_options_list()
+{
+    var iol = document.getElementById( 'input_options_list' );
+    clear_children( iol );
+    input_options.sort();
+    for( i in input_options )
+    {
+        var o = document.createElement( 'div' );
+        var ot = document.createElement( 'input' );
+        ot.setAttribute( 'type', 'text' );
+        ot.setAttribute( 'size', '60' );
+        ot.setAttribute( 'value', input_options[i] );
+        ot.setAttribute( 'id', 'input_option_item_'+i );
+        ot.setAttribute( 'onchange', 'javascript:save_input_option('+i+',this.value);' );
+        ot.setAttribute( 'onfocus', 'if( this.value == ":option=value" ) this.value = ":";' );
+        ot.setAttribute( 'onblur', 'if( this.value == ":" ) this.value = ":option=value";' );
+        o.appendChild( ot );
+        var od = document.createElement( 'a' );
+        od.setAttribute( 'href', 'javascript:delete_input_option('+i+');' );
+        var delimg = document.createElement( "img" );
+        delimg.setAttribute( 'src', 'images/delete_small.png' );
+        delimg.setAttribute( 'alt', '(delete)' );
+        od.appendChild( delimg );
+        o.appendChild( od );
+        iol.appendChild( o );
+    }
+}
+
+function delete_input_option( i )
+{
+    input_options.splice(i,1);
+    refresh_input_options_list();
+}
+
+function save_input_option( i, value )
+{
+    input_options[i] = value;
+    refresh_input_options_list();
+}
+
+function add_input_option( value )
+{
+    input_options.push( value );
+    refresh_input_options_list();
+}
+
+function remove_input_options( prefix )
+{
+    for( i in input_options )
+        if( input_options[i].substring( 0, prefix.length ) == prefix )
+        {
+            delete input_options[i];
+            i--;
+        }
+}
+
-
-/**********************************************************************

share/lua/http/requests/status.xml

@@ -31 +31 @@
-local id = tonumber(_GET['id'] or -1)
-local val = _GET['val']
+local options = _GET['option']
+if type(options) ~= "table" then -- Deal with the 0 or 1 option case
+  options = { options }
+end
-
-
+-[[]] 
-
-local function stripslashes(s)
@@ -41 +45 @@
-
-if command == "in_play" then
-
-
-
+
+
+
+
-  end
+  vlc.msg.err( "</options>" )
+  --]]
-  vlc.playlist.add({{path=stripslashes(input),options=options}})
-elseif command == "in_enqueue" then
-stripslashes(input)
+{{path=stripslashes(input),options=options}}
-elseif command == "pl_play" then
-  vlc.playlist.goto(id)

share/lua/intf/http.lua

@@ -36 +36 @@
-require "common"
-
-err
+info
-
-open_tag = "<?vlc"
@@ -176 +176 @@
-        local k_ = vlc.decode_uri(k)
-        local v_ = vlc.decode_uri(v)
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-    end
-    return t