Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-2-2
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-2-2
Commits
c5048c2e
Commit
c5048c2e
authored
Jan 14, 2012
by
Jean-Baptiste Kempf
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Qt: cleanup debug messages
parent
7e47a1f7
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
16 additions
and
23 deletions
+16
-23
modules/gui/qt4/components/controller.cpp
modules/gui/qt4/components/controller.cpp
+1
-1
modules/gui/qt4/components/extended_panels.cpp
modules/gui/qt4/components/extended_panels.cpp
+7
-9
modules/gui/qt4/components/playlist/playlist_model.cpp
modules/gui/qt4/components/playlist/playlist_model.cpp
+2
-4
modules/gui/qt4/components/playlist/standardpanel.cpp
modules/gui/qt4/components/playlist/standardpanel.cpp
+0
-2
modules/gui/qt4/dialogs/convert.cpp
modules/gui/qt4/dialogs/convert.cpp
+1
-1
modules/gui/qt4/dialogs/preferences.cpp
modules/gui/qt4/dialogs/preferences.cpp
+1
-1
modules/gui/qt4/dialogs/toolbar.cpp
modules/gui/qt4/dialogs/toolbar.cpp
+0
-1
modules/gui/qt4/main_interface_win32.cpp
modules/gui/qt4/main_interface_win32.cpp
+4
-4
No files found.
modules/gui/qt4/components/controller.cpp
View file @
c5048c2e
...
...
@@ -126,7 +126,7 @@ void AbstractController::parseAndCreate( const QString& config,
buttonType_e
i_type
=
(
buttonType_e
)
list2
.
at
(
0
).
toInt
(
&
ok
);
if
(
!
ok
)
{
msg_Warn
(
p_intf
,
"Parsing error 2. Please report this."
);
msg_Warn
(
p_intf
,
"Parsing error 2. Please
,
report this."
);
continue
;
}
...
...
modules/gui/qt4/components/extended_panels.cpp
View file @
c5048c2e
...
...
@@ -33,7 +33,6 @@
#include <QString>
#include <QFont>
#include <QGridLayout>
#include <QSignalMapper>
#include <QComboBox>
#include <QTimer>
#include <QFileDialog>
...
...
@@ -445,8 +444,7 @@ void ExtVideo::initComboBoxItems( QObject *widget )
}
else
{
msg_Err
(
p_intf
,
"Couldn't find option
\"
%s
\"
."
,
qtu
(
option
)
);
msg_Err
(
p_intf
,
"Couldn't find option
\"
%s
\"
."
,
qtu
(
option
)
);
}
}
...
...
@@ -516,20 +514,20 @@ void ExtVideo::setWidgetValue( QObject *widget )
}
else
if
(
combobox
)
combobox
->
setCurrentIndex
(
combobox
->
findData
(
qlonglong
(
val
.
i_int
)
)
);
else
msg_Warn
(
p_intf
,
"
Oops %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
else
msg_Warn
(
p_intf
,
"
Could not find the correct Integer widget"
);
}
else
if
(
i_type
==
VLC_VAR_FLOAT
)
{
if
(
slider
)
slider
->
setValue
(
(
int
)(
val
.
f_float
*
(
double
)
slider
->
tickInterval
()
)
);
/* hack alert! */
else
if
(
doublespinbox
)
doublespinbox
->
setValue
(
val
.
f_float
);
else
msg_Warn
(
p_intf
,
"
Oops %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
else
msg_Warn
(
p_intf
,
"
Could not find the correct Float widget"
);
}
else
if
(
i_type
==
VLC_VAR_STRING
)
{
if
(
lineedit
)
lineedit
->
setText
(
qfu
(
val
.
psz_string
)
);
else
if
(
combobox
)
combobox
->
setCurrentIndex
(
combobox
->
findData
(
qfu
(
val
.
psz_string
)
)
);
else
msg_Warn
(
p_intf
,
"
Oops %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
else
msg_Warn
(
p_intf
,
"
Could not find the correct String widget"
);
free
(
val
.
psz_string
);
}
else
...
...
@@ -586,7 +584,7 @@ void ExtVideo::updateFilterOptions()
else
if
(
dial
)
i_int
=
(
540
-
dial
->
value
()
)
%
360
;
else
if
(
lineedit
)
i_int
=
lineedit
->
text
().
toInt
(
NULL
,
16
);
else
if
(
combobox
)
i_int
=
combobox
->
itemData
(
combobox
->
currentIndex
()
).
toInt
();
else
msg_Warn
(
p_intf
,
"
Oops %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
else
msg_Warn
(
p_intf
,
"
Could not find the correct Integer widget"
);
config_PutInt
(
p_intf
,
qtu
(
option
),
i_int
);
if
(
b_is_command
)
{
...
...
@@ -603,7 +601,7 @@ void ExtVideo::updateFilterOptions()
/
(
double
)
slider
->
tickInterval
();
/* hack alert! */
else
if
(
doublespinbox
)
f_float
=
doublespinbox
->
value
();
else
if
(
lineedit
)
f_float
=
lineedit
->
text
().
toDouble
();
else
msg_Warn
(
p_intf
,
"
Oops %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
else
msg_Warn
(
p_intf
,
"
Could not find the correct Float widget"
);
config_PutFloat
(
p_intf
,
qtu
(
option
),
f_float
);
if
(
b_is_command
)
var_SetFloat
(
p_obj
,
qtu
(
option
),
f_float
);
...
...
@@ -616,7 +614,7 @@ void ExtVideo::updateFilterOptions()
else
if
(
combobox
)
val
=
combobox
->
itemData
(
combobox
->
currentIndex
()
).
toString
();
else
msg_Warn
(
p_intf
,
"
Oops %s %s %d"
,
__FILE__
,
__func__
,
__LINE__
);
msg_Warn
(
p_intf
,
"
Could not find the correct String widget"
);
config_PutPsz
(
p_intf
,
qtu
(
option
),
qtu
(
val
)
);
if
(
b_is_command
)
var_SetString
(
p_obj
,
qtu
(
option
),
qtu
(
val
)
);
...
...
modules/gui/qt4/components/playlist/playlist_model.cpp
View file @
c5048c2e
...
...
@@ -486,7 +486,7 @@ QModelIndex PLModel::parent( const QModelIndex &index ) const
PLItem
*
childItem
=
getItem
(
index
);
if
(
!
childItem
)
{
msg_Err
(
p_playlist
,
"
NULL CHILD
"
);
msg_Err
(
p_playlist
,
"
Item not found
"
);
return
QModelIndex
();
}
...
...
@@ -494,8 +494,7 @@ QModelIndex PLModel::parent( const QModelIndex &index ) const
if
(
!
parentItem
||
parentItem
==
rootItem
)
return
QModelIndex
();
if
(
!
parentItem
->
parent
()
)
{
msg_Err
(
p_playlist
,
"No parent parent, trying row 0 "
);
msg_Err
(
p_playlist
,
"----- PLEASE REPORT THIS ------"
);
msg_Err
(
p_playlist
,
"No parent found, trying row 0. Please report this"
);
return
createIndex
(
0
,
0
,
parentItem
);
}
return
createIndex
(
parentItem
->
row
(),
0
,
parentItem
);
...
...
@@ -699,7 +698,6 @@ void PLModel::insertChildren( PLItem *node, QList<PLItem*>& items, int i_pos )
assert
(
node
);
int
count
=
items
.
count
();
if
(
!
count
)
return
;
printf
(
"Here I am
\n
"
);
beginInsertRows
(
index
(
node
,
0
),
i_pos
,
i_pos
+
count
-
1
);
for
(
int
i
=
0
;
i
<
count
;
i
++
)
{
...
...
modules/gui/qt4/components/playlist/standardpanel.cpp
View file @
c5048c2e
...
...
@@ -174,7 +174,6 @@ void StandardPLPanel::searchDelayed( const QString& searchText )
if
(
type
==
SD_TYPE
&&
can_search
)
{
msg_Err
(
p_intf
,
"SEARCHING DELAYED"
);
if
(
!
name
.
isEmpty
()
&&
!
searchText
.
isEmpty
()
)
playlist_ServicesDiscoveryControl
(
THEPL
,
qtu
(
name
),
SD_CMD_SEARCH
,
qtu
(
searchText
)
);
...
...
@@ -196,7 +195,6 @@ void StandardPLPanel::setRootItem( playlist_item_t *p_item, bool b )
Q_UNUSED
(
b
);
#endif
{
msg_Dbg
(
p_intf
,
"Normal PL/ML or SD"
);
if
(
currentView
->
model
()
!=
model
)
currentView
->
setModel
(
model
);
model
->
rebuild
(
p_item
);
...
...
modules/gui/qt4/dialogs/convert.cpp
View file @
c5048c2e
...
...
@@ -146,7 +146,7 @@ void ConvertDialog::close()
mrl
+=
"}"
;
}
msg_
Warn
(
p_intf
,
"Transcode MRL: %s"
,
qtu
(
mrl
)
);
msg_
Dbg
(
p_intf
,
"Transcode MRL: %s"
,
qtu
(
mrl
)
);
accept
();
}
...
...
modules/gui/qt4/dialogs/preferences.cpp
View file @
c5048c2e
...
...
@@ -115,7 +115,7 @@ PrefsDialog::PrefsDialog( QWidget *parent, intf_thread_t *_p_intf )
main_panel_l
->
setContentsMargins
(
6
,
0
,
0
,
3
);
b_small
=
(
p_intf
->
p_sys
->
i_screenHeight
<
750
);
if
(
b_small
)
msg_Dbg
(
p_intf
,
"Small"
);
if
(
b_small
)
msg_Dbg
(
p_intf
,
"Small
Resolution
"
);
setMaximumHeight
(
p_intf
->
p_sys
->
i_screenHeight
);
for
(
int
i
=
0
;
i
<
SPrefsMax
;
i
++
)
simple_panels
[
i
]
=
NULL
;
...
...
modules/gui/qt4/dialogs/toolbar.cpp
View file @
c5048c2e
...
...
@@ -260,7 +260,6 @@ void ToolbarEditDialog::changeProfile( int i )
void
ToolbarEditDialog
::
close
()
{
msg_Dbg
(
p_intf
,
"Close and save"
);
getSettings
()
->
setValue
(
"MainWindow/ToolbarPos"
,
positionCombo
->
itemData
(
positionCombo
->
currentIndex
()
).
toInt
()
);
getSettings
()
->
setValue
(
"MainWindow/MainToolbar1"
,
controller1
->
getValue
()
);
...
...
modules/gui/qt4/main_interface_win32.cpp
View file @
c5048c2e
...
...
@@ -103,13 +103,13 @@ void MainInterface::createTaskBarButtons()
QBitmap
mask4
=
img4
.
createMaskFromColor
(
Qt
::
transparent
);
if
(
-
1
==
ImageList_Add
(
himl
,
img
.
toWinHBITMAP
(
QPixmap
::
PremultipliedAlpha
),
mask
.
toWinHBITMAP
()))
msg_Err
(
p_intf
,
"ImageList_Add failed"
);
msg_Err
(
p_intf
,
"
First
ImageList_Add failed"
);
if
(
-
1
==
ImageList_Add
(
himl
,
img2
.
toWinHBITMAP
(
QPixmap
::
PremultipliedAlpha
),
mask2
.
toWinHBITMAP
()))
msg_Err
(
p_intf
,
"ImageList_Add failed"
);
msg_Err
(
p_intf
,
"
Second
ImageList_Add failed"
);
if
(
-
1
==
ImageList_Add
(
himl
,
img3
.
toWinHBITMAP
(
QPixmap
::
PremultipliedAlpha
),
mask3
.
toWinHBITMAP
()))
msg_Err
(
p_intf
,
"ImageList_Add failed"
);
msg_Err
(
p_intf
,
"
Third
ImageList_Add failed"
);
if
(
-
1
==
ImageList_Add
(
himl
,
img4
.
toWinHBITMAP
(
QPixmap
::
PremultipliedAlpha
),
mask4
.
toWinHBITMAP
()))
msg_Err
(
p_intf
,
"ImageList_Add failed"
);
msg_Err
(
p_intf
,
"
Fourth
ImageList_Add failed"
);
}
// Define an array of two buttons. These buttons provide images through an
...
...
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