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
18eb8839
Commit
18eb8839
authored
Jan 14, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt4: get rid of qta in favor of qtu
parent
a19acf0b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
5 additions
and
6 deletions
+5
-6
modules/gui/qt4/dialogs/open.cpp
modules/gui/qt4/dialogs/open.cpp
+2
-2
modules/gui/qt4/dialogs/sout.cpp
modules/gui/qt4/dialogs/sout.cpp
+3
-3
modules/gui/qt4/qt4.hpp
modules/gui/qt4/qt4.hpp
+0
-1
No files found.
modules/gui/qt4/dialogs/open.cpp
View file @
18eb8839
...
@@ -396,7 +396,7 @@ void OpenDialog::updateMRL() {
...
@@ -396,7 +396,7 @@ void OpenDialog::updateMRL() {
if
(
ui
.
slaveCheckbox
->
isChecked
()
)
{
if
(
ui
.
slaveCheckbox
->
isChecked
()
)
{
mrl
+=
" :input-slave="
+
ui
.
slaveText
->
text
();
mrl
+=
" :input-slave="
+
ui
.
slaveText
->
text
();
}
}
int
i_cache
=
config_GetInt
(
p_intf
,
qt
a
(
storedMethod
)
);
int
i_cache
=
config_GetInt
(
p_intf
,
qt
u
(
storedMethod
)
);
if
(
i_cache
!=
ui
.
cacheSpinBox
->
value
()
)
{
if
(
i_cache
!=
ui
.
cacheSpinBox
->
value
()
)
{
mrl
+=
QString
(
" :%1=%2"
).
arg
(
storedMethod
).
mrl
+=
QString
(
" :%1=%2"
).
arg
(
storedMethod
).
arg
(
ui
.
cacheSpinBox
->
value
()
);
arg
(
ui
.
cacheSpinBox
->
value
()
);
...
@@ -412,7 +412,7 @@ void OpenDialog::newCachingMethod( QString method )
...
@@ -412,7 +412,7 @@ void OpenDialog::newCachingMethod( QString method )
{
{
if
(
method
!=
storedMethod
)
{
if
(
method
!=
storedMethod
)
{
storedMethod
=
method
;
storedMethod
=
method
;
int
i_value
=
config_GetInt
(
p_intf
,
qt
a
(
storedMethod
)
);
int
i_value
=
config_GetInt
(
p_intf
,
qt
u
(
storedMethod
)
);
ui
.
cacheSpinBox
->
setValue
(
i_value
);
ui
.
cacheSpinBox
->
setValue
(
i_value
);
}
}
}
}
...
...
modules/gui/qt4/dialogs/sout.cpp
View file @
18eb8839
...
@@ -137,7 +137,7 @@ public:
...
@@ -137,7 +137,7 @@ public:
if
(
!
value
.
isEmpty
()
)
if
(
!
value
.
isEmpty
()
)
{
{
char
*
psz
=
config_StringEscape
(
qt
a
(
value
)
);
char
*
psz
=
config_StringEscape
(
qt
u
(
value
)
);
if
(
psz
)
if
(
psz
)
{
{
QString
v
=
QString
(
psz
);
QString
v
=
QString
(
psz
);
...
@@ -339,7 +339,7 @@ void SoutDialog::setOptions()
...
@@ -339,7 +339,7 @@ void SoutDialog::setOptions()
{
{
QString
profileString
=
QString
profileString
=
ui
.
profileBox
->
itemData
(
ui
.
profileBox
->
currentIndex
()
).
toString
();
ui
.
profileBox
->
itemData
(
ui
.
profileBox
->
currentIndex
()
).
toString
();
msg_Dbg
(
p_intf
,
"Profile Used: %s"
,
qt
a
(
profileString
));
msg_Dbg
(
p_intf
,
"Profile Used: %s"
,
qt
u
(
profileString
));
int
index
;
int
index
;
#define setProfile( muxName, hasVideo, vCodecName, hasAudio, aCodecName ) \
#define setProfile( muxName, hasVideo, vCodecName, hasAudio, aCodecName ) \
...
@@ -497,7 +497,7 @@ void SoutDialog::updateMRL()
...
@@ -497,7 +497,7 @@ void SoutDialog::updateMRL()
sout
.
i_ab
=
ui
.
aBitrateSpin
->
value
();
sout
.
i_ab
=
ui
.
aBitrateSpin
->
value
();
sout
.
i_vb
=
ui
.
vBitrateSpin
->
value
();
sout
.
i_vb
=
ui
.
vBitrateSpin
->
value
();
sout
.
i_channels
=
ui
.
aChannelsSpin
->
value
();
sout
.
i_channels
=
ui
.
aChannelsSpin
->
value
();
sout
.
f_scale
=
atof
(
qt
a
(
ui
.
vScaleBox
->
currentText
()
)
);
sout
.
f_scale
=
atof
(
qt
u
(
ui
.
vScaleBox
->
currentText
()
)
);
sout
.
psz_group
=
strdup
(
qtu
(
ui
.
sapGroup
->
text
()
)
);
sout
.
psz_group
=
strdup
(
qtu
(
ui
.
sapGroup
->
text
()
)
);
sout
.
psz_name
=
strdup
(
qtu
(
ui
.
sapName
->
text
()
)
);
sout
.
psz_name
=
strdup
(
qtu
(
ui
.
sapName
->
text
()
)
);
...
...
modules/gui/qt4/qt4.hpp
View file @
18eb8839
...
@@ -85,7 +85,6 @@ struct intf_sys_t
...
@@ -85,7 +85,6 @@ struct intf_sys_t
#define qfu( i ) QString::fromUtf8( i )
#define qfu( i ) QString::fromUtf8( i )
#define qtr( i ) QString::fromUtf8( _(i) )
#define qtr( i ) QString::fromUtf8( _(i) )
#define qtu( i ) ((i).toUtf8().constData())
#define qtu( i ) ((i).toUtf8().constData())
#define qta( i ) ((i).toAscii().constData())
#define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
#define CONNECT( a, b, c, d ) connect( a, SIGNAL( b ), c, SLOT(d) )
#define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
#define BUTTONACT( b, a ) connect( b, SIGNAL( clicked() ), this, SLOT(a) )
...
...
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