Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Redmine
Redmine
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Operations
Operations
Metrics
Environments
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
videolan
vlc
Commits
9effd9e7
Commit
9effd9e7
authored
Apr 01, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: remove DMO selection from Simple Prefs
Ref #5814
parent
ca0752e4
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
7 additions
and
18 deletions
+7
-18
modules/gui/qt4/components/simple_preferences.cpp
modules/gui/qt4/components/simple_preferences.cpp
+0
-3
modules/gui/qt4/ui/sprefs_input.ui
modules/gui/qt4/ui/sprefs_input.ui
+7
-15
No files found.
modules/gui/qt4/components/simple_preferences.cpp
View file @
9effd9e7
...
...
@@ -472,14 +472,11 @@ SPrefsPanel::SPrefsPanel( intf_thread_t *_p_intf, QWidget *_parent,
}
CONFIG_BOOL
(
"ffmpeg-hw"
,
hwAccelBox
);
#ifdef WIN32
CONFIG_BOOL
(
"prefer-system-codecs"
,
systemCodecBox
);
HINSTANCE
hdxva2_dll
=
LoadLibrary
(
TEXT
(
"DXVA2.DLL"
)
);
if
(
!
hdxva2_dll
)
ui
.
hwAccelBox
->
setEnabled
(
false
);
else
FreeLibrary
(
hdxva2_dll
);
#else
ui
.
systemCodecBox
->
hide
();
#endif
optionWidgets
.
append
(
ui
.
DVDDeviceComboBox
);
optionWidgets
.
append
(
ui
.
cachingCombo
);
...
...
modules/gui/qt4/ui/sprefs_input.ui
View file @
9effd9e7
...
...
@@ -24,7 +24,7 @@
<item
row=
"8"
column=
"2"
colspan=
"2"
>
<widget
class=
"QComboBox"
name=
"loopFilterBox"
/>
</item>
<item
row=
"1
3
"
column=
"0"
>
<item
row=
"1
2
"
column=
"0"
>
<widget
class=
"QLabel"
name=
"x264Label"
>
<property
name=
"minimumSize"
>
<size>
...
...
@@ -40,7 +40,7 @@
</property>
</widget>
</item>
<item
row=
"1
2
"
column=
"0"
>
<item
row=
"1
1
"
column=
"0"
>
<widget
class=
"QLabel"
name=
"x264profileLabel"
>
<property
name=
"minimumSize"
>
<size>
...
...
@@ -56,7 +56,7 @@
</property>
</widget>
</item>
<item
row=
"1
2
"
column=
"1"
colspan=
"2"
>
<item
row=
"1
1
"
column=
"1"
colspan=
"2"
>
<widget
class=
"QComboBox"
name=
"presetBox"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Expanding"
vsizetype=
"Fixed"
>
...
...
@@ -66,7 +66,7 @@
</property>
</widget>
</item>
<item
row=
"1
2
"
column=
"3"
>
<item
row=
"1
1
"
column=
"3"
>
<widget
class=
"QComboBox"
name=
"tuneBox"
/>
</item>
<item
row=
"4"
column=
"0"
colspan=
"3"
>
...
...
@@ -76,17 +76,17 @@
</property>
</widget>
</item>
<item
row=
"1
1
"
column=
"0"
colspan=
"4"
>
<item
row=
"1
0
"
column=
"0"
colspan=
"4"
>
<widget
class=
"Line"
name=
"line"
>
<property
name=
"orientation"
>
<enum>
Qt::Horizontal
</enum>
</property>
</widget>
</item>
<item
row=
"1
3
"
column=
"3"
>
<item
row=
"1
2
"
column=
"3"
>
<widget
class=
"QLineEdit"
name=
"levelBox"
/>
</item>
<item
row=
"1
3
"
column=
"1"
colspan=
"2"
>
<item
row=
"1
2
"
column=
"1"
colspan=
"2"
>
<widget
class=
"QComboBox"
name=
"profileBox"
>
<property
name=
"sizePolicy"
>
<sizepolicy
hsizetype=
"Preferred"
vsizetype=
"Fixed"
>
...
...
@@ -112,13 +112,6 @@
</property>
</widget>
</item>
<item
row=
"10"
column=
"0"
colspan=
"4"
>
<widget
class=
"QCheckBox"
name=
"systemCodecBox"
>
<property
name=
"text"
>
<string>
Use systems codecs if available, for WMV codecs
</string>
</property>
</widget>
</item>
<item
row=
"5"
column=
"0"
>
<widget
class=
"QLabel"
name=
"ppLabel"
>
<property
name=
"minimumSize"
>
...
...
@@ -355,7 +348,6 @@
<tabstop>
hwAccelBox
</tabstop>
<tabstop>
PostProcLevel
</tabstop>
<tabstop>
loopFilterBox
</tabstop>
<tabstop>
systemCodecBox
</tabstop>
<tabstop>
presetBox
</tabstop>
<tabstop>
tuneBox
</tabstop>
<tabstop>
profileBox
</tabstop>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment