vlc | branch: master | Rémi Denis-Courmont <[email protected]> | Mon Mar 28 12:16:14 2011 +0300| [1d63113ce84a68a9891c62990d01c8edfd58937b] | committer: Rémi Denis-Courmont
Qt4: update DTV plugin name on Windows > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=1d63113ce84a68a9891c62990d01c8edfd58937b --- modules/gui/qt4/components/open_panels.cpp | 4 ++-- modules/gui/qt4/components/open_panels.hpp | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/modules/gui/qt4/components/open_panels.cpp b/modules/gui/qt4/components/open_panels.cpp index 56910e7..6d6af1c 100644 --- a/modules/gui/qt4/components/open_panels.cpp +++ b/modules/gui/qt4/components/open_panels.cpp @@ -68,7 +68,7 @@ .replaceInStrings( QRegExp("^"), "/dev/" ) \ ); -static const char psz_devModule[][8] = { "v4l2", "pvr", DTV_PLUGIN, +static const char psz_devModule[][8] = { "v4l2", "pvr", "dtv", "dshow", "screen", "jack" }; /************************************************************************** @@ -931,7 +931,7 @@ void CaptureOpenPanel::initialize() /************* * DVB Stuff * *************/ - if( module_exists( DTV_PLUGIN ) ){ + if( module_exists( "dtv" ) ){ addModuleAndLayouts( DTV_DEVICE, dvb, N_("TV (digital)"), QGridLayout ); /* DVB Main */ diff --git a/modules/gui/qt4/components/open_panels.hpp b/modules/gui/qt4/components/open_panels.hpp index 197d94d..627e5bc 100644 --- a/modules/gui/qt4/components/open_panels.hpp +++ b/modules/gui/qt4/components/open_panels.hpp @@ -202,7 +202,6 @@ private: #ifdef WIN32 StringListConfigControl *vdevDshowW, *adevDshowW; QLineEdit *dshowVSizeLine; -# define DTV_PLUGIN "bda" #else QSpinBox *pvrFreq, *pvrBitr; QComboBox *v4l2VideoDevice, *v4l2AudioDevice; @@ -211,7 +210,6 @@ private: QSpinBox *jackChannels, *jackCaching; QCheckBox *jackPace, *jackConnect; QLineEdit *jackPortsSelected; -# define DTV_PLUGIN "dtv" #endif QRadioButton *dvbc, *dvbs, *dvbs2, *dvbt, *atsc, *cqam; QLabel *dvbBandLabel, *dvbSrateLabel, *dvbModLabel; _______________________________________________ vlc-commits mailing list [email protected] http://mailman.videolan.org/listinfo/vlc-commits
