Changeset 5d03d245a77eccb97eb82dfa7f198f8375aec5f3

Show
Ignore:
Timestamp:
01/03/07 23:43:30 (2 years ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1172789010 +0000
git-parent:

[cb04ed6ba36066f0f3dcd295324e6ed5fe3ee6aa]

git-author:
Jean-Baptiste Kempf <jb@videolan.org> 1172789010 +0000
Message:

Qt4 - SPrefs : Input Panel. almost all implementations, but not the macro-ones (network-caching and disk-device )

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • modules/gui/qt4/components/simple_preferences.cpp

    re088c92 r5d03d24  
    133133    switch( number ) 
    134134    { 
     135        /* Video Panel Implementation */ 
    135136        START_SPREFS_CAT( Video , "General video settings" ); 
    136137         #ifndef WIN32 
    …… 
    161162         END_SPREFS_CAT; 
    162163 
     164         /* Audio Panel Implementation */ 
    163165        START_SPREFS_CAT( Audio,  "General audio settings" ); 
    164166#ifdef WIN32 
    …… 
    197199        END_SPREFS_CAT; 
    198200 
     201        /* Input and Codecs Panel Implementation */ 
    199202        START_SPREFS_CAT( InputAndCodecs, "Input & Codecs settings"  ); 
    200  
     203          /* Disk Devices */ 
     204/*          CONFIG_GENERIC( );*/ 
     205 
     206          CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort ); 
     207          CONFIG_GENERIC( "http-proxy", String , NULL, proxy ); 
     208 
     209          /* Caching */ 
     210/*          CONFIG_GENERIC( );*/ 
     211 
     212          CONFIG_GENERIC_NO_BOOL( "ffmpeg-pp-q", Integer, NULL, PostProcLevel ); 
     213          CONFIG_GENERIC( "avi-index", IntegerList, NULL, AviRepair ); 
     214          CONFIG_GENERIC( "rtsp-tcp", Bool, NULL, RTSP_TCPBox ); 
     215 
     216          CONFIG_GENERIC( "timeshift-force", Bool, NULL, timeshiftBox ); 
     217          CONFIG_GENERIC( "dump-force", Bool, NULL, DumpBox ); 
     218//        CONFIG_GENERIC( "", Bool, NULL, RecordBox ); //FIXME activate record  
    201219        END_SPREFS_CAT; 
    202220 

  • modules/gui/qt4/ui/sprefs_input.ui

    rb248dab r5d03d24  
    22 <author>Jean-Baptiste Kempf</author> 
    33 <class>SPrefsInputAndCodecs</class> 
    4  <widget class="QWidget" name="SprefsInputAndCodecs" > 
     4 <widget class="QWidget" name="SPrefsInputAndCodecs" > 
    55  <property name="geometry" > 
    66   <rect> 
    …… 
    9393      </item> 
    9494      <item row="1" column="1" colspan="2" > 
    95        <widget class="QLineEdit" name="lineEdit" /> 
     95       <widget class="QLineEdit" name="proxy" /> 
    9696      </item> 
    9797      <item row="0" column="1" colspan="2" > 
    …… 
    114114       <widget class="QLabel" name="label_4" > 
    115115        <property name="text" > 
    116          <string>UDP Default Port</string> 
     116         <string>Server Default Port</string> 
    117117        </property> 
    118118       </widget> 
    …… 
    134134      </property> 
    135135      <item row="2" column="0" > 
    136        <widget class="QCheckBox" name="RTCP_TCPBox" > 
    137         <property name="text" > 
    138          <string>Use RTP over RTCP (TCP)</string> 
     136       <widget class="QCheckBox" name="RTSP_TCPBox" > 
     137        <property name="text" > 
     138         <string>Use RTP over RTSP (TCP)</string> 
    139139        </property> 
    140140       </widget>