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
91082b5b
Commit
91082b5b
authored
Mar 05, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
intf_UserWarn: remove dead code
parent
70e58dfa
Changes
7
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
3 additions
and
43 deletions
+3
-43
include/vlc_interface.h
include/vlc_interface.h
+0
-3
modules/gui/macosx/interaction.m
modules/gui/macosx/interaction.m
+0
-6
modules/gui/qt4/dialogs/errors.cpp
modules/gui/qt4/dialogs/errors.cpp
+2
-2
modules/gui/qt4/dialogs/errors.hpp
modules/gui/qt4/dialogs/errors.hpp
+1
-1
modules/gui/qt4/dialogs/interaction.cpp
modules/gui/qt4/dialogs/interaction.cpp
+0
-7
src/interface/interaction.c
src/interface/interaction.c
+0
-23
src/libvlccore.sym
src/libvlccore.sym
+0
-1
No files found.
include/vlc_interface.h
View file @
91082b5b
...
@@ -236,7 +236,6 @@ struct interaction_dialog_t
...
@@ -236,7 +236,6 @@ struct interaction_dialog_t
#define DIALOG_PSZ_INPUT_OK_CANCEL 0x08
#define DIALOG_PSZ_INPUT_OK_CANCEL 0x08
#define DIALOG_BLOCKING_ERROR 0x10
#define DIALOG_BLOCKING_ERROR 0x10
#define DIALOG_NONBLOCKING_ERROR 0x20
#define DIALOG_NONBLOCKING_ERROR 0x20
#define DIALOG_WARNING 0x40
#define DIALOG_USER_PROGRESS 0x80
#define DIALOG_USER_PROGRESS 0x80
#define DIALOG_INTF_PROGRESS 0x100
#define DIALOG_INTF_PROGRESS 0x100
...
@@ -282,8 +281,6 @@ enum
...
@@ -282,8 +281,6 @@ enum
#define intf_UserFatal( a, b, c, d, e... ) __intf_UserFatal( VLC_OBJECT(a),b,c,d, ## e )
#define intf_UserFatal( a, b, c, d, e... ) __intf_UserFatal( VLC_OBJECT(a),b,c,d, ## e )
VLC_EXPORT
(
int
,
__intf_UserFatal
,(
vlc_object_t
*
,
bool
,
const
char
*
,
const
char
*
,
...)
LIBVLC_FORMAT
(
4
,
5
)
);
VLC_EXPORT
(
int
,
__intf_UserFatal
,(
vlc_object_t
*
,
bool
,
const
char
*
,
const
char
*
,
...)
LIBVLC_FORMAT
(
4
,
5
)
);
#define intf_UserWarn( a, c, d, e... ) __intf_UserWarn( VLC_OBJECT(a),c,d, ## e )
VLC_EXPORT
(
int
,
__intf_UserWarn
,(
vlc_object_t
*
,
const
char
*
,
const
char
*
,
...)
LIBVLC_FORMAT
(
3
,
4
)
);
#define intf_UserLoginPassword( a, b, c, d, e... ) __intf_UserLoginPassword( VLC_OBJECT(a),b,c,d,e)
#define intf_UserLoginPassword( a, b, c, d, e... ) __intf_UserLoginPassword( VLC_OBJECT(a),b,c,d,e)
VLC_EXPORT
(
int
,
__intf_UserLoginPassword
,(
vlc_object_t
*
,
const
char
*
,
const
char
*
,
char
**
,
char
**
)
);
VLC_EXPORT
(
int
,
__intf_UserLoginPassword
,(
vlc_object_t
*
,
const
char
*
,
const
char
*
,
char
**
,
char
**
)
);
#define intf_UserYesNo( a, b, c, d, e, f ) __intf_UserYesNo( VLC_OBJECT(a),b,c, d, e, f )
#define intf_UserYesNo( a, b, c, d, e, f ) __intf_UserYesNo( VLC_OBJECT(a),b,c, d, e, f )
...
...
modules/gui/macosx/interaction.m
View file @
91082b5b
...
@@ -182,12 +182,6 @@
...
@@ -182,12 +182,6 @@
[[[[
VLCMain
sharedInstance
]
getInteractionList
]
getErrorPanel
]
[[[[
VLCMain
sharedInstance
]
getInteractionList
]
getErrorPanel
]
addError:
o_title
withMsg
:
o_description
];
addError:
o_title
withMsg
:
o_description
];
}
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_WARNING
)
{
msg_Dbg
(
p_intf
,
"addition to non-blocking warning panel received"
);
[[[[
VLCMain
sharedInstance
]
getInteractionList
]
getErrorPanel
]
addWarning:
o_title
withMsg
:
o_description
];
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_YES_NO_CANCEL
)
else
if
(
p_dialog
->
i_flags
&
DIALOG_YES_NO_CANCEL
)
{
{
msg_Dbg
(
p_intf
,
"yes-no-cancel-dialog requested"
);
msg_Dbg
(
p_intf
,
"yes-no-cancel-dialog requested"
);
...
...
modules/gui/qt4/dialogs/errors.cpp
View file @
91082b5b
...
@@ -72,10 +72,10 @@ void ErrorsDialog::addError( QString title, QString text )
...
@@ -72,10 +72,10 @@ void ErrorsDialog::addError( QString title, QString text )
add
(
true
,
title
,
text
);
add
(
true
,
title
,
text
);
}
}
void
ErrorsDialog
::
addWarning
(
QString
title
,
QString
text
)
/*
void ErrorsDialog::addWarning( QString title, QString text )
{
{
add( false, title, text );
add( false, title, text );
}
}
*/
void
ErrorsDialog
::
add
(
bool
error
,
QString
title
,
QString
text
)
void
ErrorsDialog
::
add
(
bool
error
,
QString
title
,
QString
text
)
{
{
...
...
modules/gui/qt4/dialogs/errors.hpp
View file @
91082b5b
...
@@ -44,7 +44,7 @@ public:
...
@@ -44,7 +44,7 @@ public:
virtual
~
ErrorsDialog
()
{};
virtual
~
ErrorsDialog
()
{};
void
addError
(
QString
,
QString
);
void
addError
(
QString
,
QString
);
void
addWarning
(
QString
,
QString
);
/*void addWarning( QString, QString );*/
private:
private:
ErrorsDialog
(
QWidget
*
parent
,
intf_thread_t
*
);
ErrorsDialog
(
QWidget
*
parent
,
intf_thread_t
*
);
static
ErrorsDialog
*
instance
;
static
ErrorsDialog
*
instance
;
...
...
modules/gui/qt4/dialogs/interaction.cpp
View file @
91082b5b
...
@@ -61,13 +61,6 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
...
@@ -61,13 +61,6 @@ InteractionDialog::InteractionDialog( intf_thread_t *_p_intf,
qfu
(
p_dialog
->
psz_title
),
qfu
(
p_dialog
->
psz_description
)
);
qfu
(
p_dialog
->
psz_title
),
qfu
(
p_dialog
->
psz_description
)
);
i_ret
=
QMessageBox
::
AcceptRole
;
i_ret
=
QMessageBox
::
AcceptRole
;
}
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_WARNING
)
{
if
(
config_GetInt
(
p_intf
,
"qt-error-dialogs"
)
!=
0
)
ErrorsDialog
::
getInstance
(
p_intf
)
->
addWarning
(
qfu
(
p_dialog
->
psz_title
),
qfu
(
p_dialog
->
psz_description
)
);
i_ret
=
QMessageBox
::
AcceptRole
;
}
else
if
(
p_dialog
->
i_flags
&
DIALOG_YES_NO_CANCEL
)
else
if
(
p_dialog
->
i_flags
&
DIALOG_YES_NO_CANCEL
)
{
{
p_dialog
->
i_status
=
SENT_DIALOG
;
p_dialog
->
i_status
=
SENT_DIALOG
;
...
...
src/interface/interaction.c
View file @
91082b5b
...
@@ -124,29 +124,6 @@ int __intf_UserFatal( vlc_object_t *p_this, bool b_blocking,
...
@@ -124,29 +124,6 @@ int __intf_UserFatal( vlc_object_t *p_this, bool b_blocking,
return
DialogFireForget
(
p_new
);
return
DialogFireForget
(
p_new
);
}
}
/**
* Helper function to send a warning, which is always shown non-blocking
*
* \param p_this Parent vlc_object
* \param psz_title Title for the dialog
* \param psz_format The message to display
* \return VLC_SUCCESS or VLC_EGENERIC
*/
int
__intf_UserWarn
(
vlc_object_t
*
p_this
,
const
char
*
psz_title
,
const
char
*
psz_format
,
...
)
{
va_list
args
;
DIALOG_INIT
(
ONEWAY
,
VLC_EGENERIC
);
p_new
->
psz_title
=
strdup
(
psz_title
);
FORMAT_DESC
;
p_new
->
i_flags
=
DIALOG_WARNING
;
return
DialogFireForget
(
p_new
);
}
/**
/**
* Helper function to ask a yes-no-cancel question
* Helper function to ask a yes-no-cancel question
*
*
...
...
src/libvlccore.sym
View file @
91082b5b
...
@@ -202,7 +202,6 @@ __intf_UserFatal
...
@@ -202,7 +202,6 @@ __intf_UserFatal
intf_UserHide
intf_UserHide
__intf_UserLoginPassword
__intf_UserLoginPassword
__intf_UserStringInput
__intf_UserStringInput
__intf_UserWarn
__intf_UserYesNo
__intf_UserYesNo
IsUTF8
IsUTF8
libvlc_InternalAddIntf
libvlc_InternalAddIntf
...
...
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