Changeset 23bc3916fea067e6a50ba5431d337957eaf06aab

Show
Ignore:
Timestamp:
29/10/07 02:47:26 (1 year ago)
Author:
Jean-Baptiste Kempf <jb@videolan.org>
git-committer:
Jean-Baptiste Kempf <jb@videolan.org> 1193622446 +0000
git-parent:

[93b0b1790b5c1c9cc252de109aaa351c0689b255]

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

Qt4 - SPrefs, device selection. Please Review, since I am far from sure that this is a good idea...
Moreover, is it config_PutPsz( p, name, ASCII ) or config_PutPsz( p, name, UTF-8 ) ?

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

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

    r495602e r23bc391  
    269269        START_SPREFS_CAT( InputAndCodecs, qtr("Input & Codecs settings") ); 
    270270          /* Disk Devices */ 
    271 /*          CONFIG_GENERIC( );*/ //FIXME 
     271            { 
     272                ui.DVDDevice->setToolTip( qtr( "If this propriety is blank, then you have\n" 
     273                                                "values for DVD, VCD, and CDDA.\n You can define" 
     274                                                " a unique one or set that in the advanced preferences" ) ); 
     275                char *psz_dvddiscpath = config_GetPsz( p_intf, "dvd" ); 
     276                char *psz_vcddiscpath = config_GetPsz( p_intf, "vcd" ); 
     277                char *psz_cddadiscpath = config_GetPsz( p_intf, "cd-audio" ); 
     278                if( ( *psz_cddadiscpath == *psz_dvddiscpath ) 
     279                   && ( *psz_dvddiscpath == *psz_vcddiscpath ) ) 
     280                { 
     281                    ui.DVDDevice->setText( qfu( psz_dvddiscpath ) ); 
     282                } 
     283                delete psz_cddadiscpath; delete psz_dvddiscpath; delete psz_vcddiscpath; 
     284            } 
    272285 
    273286          CONFIG_GENERIC_NO_BOOL( "server-port", Integer, NULL, UDPPort ); 
    …… 
    387400        c->doApply( p_intf ); 
    388401    } 
     402    /* Devices */ 
     403    //FIXME is it qta or qtu ???? 
     404    char *psz_devicepath = qtu( ui.DVDDevice->Text() ); 
     405    if( !EMPTY_STR( psz_devicepath ) ) 
     406    { 
     407        config_PutPsz( p_intf, "dvd", psz_devicepath ); 
     408        config_PutPsz( p_intf, "vcd", psz_devicepath ); 
     409        config_PutPsz( p_intf, "cd-audio", psz_devicepath ); 
     410    } 
    389411} 
    390412