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
ead147e1
Commit
ead147e1
authored
Jan 12, 2009
by
Rémi Denis-Courmont
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Hide interaction object layout
parent
61f37d78
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
24 additions
and
24 deletions
+24
-24
include/vlc_interface.h
include/vlc_interface.h
+0
-14
modules/gui/macosx/interaction.m
modules/gui/macosx/interaction.m
+8
-8
modules/gui/qt4/dialogs/interaction.cpp
modules/gui/qt4/dialogs/interaction.cpp
+2
-2
src/interface/interface.h
src/interface/interface.h
+14
-0
No files found.
include/vlc_interface.h
View file @
ead147e1
...
@@ -273,20 +273,6 @@ enum
...
@@ -273,20 +273,6 @@ enum
INTERACT_DESTROY
INTERACT_DESTROY
};
};
/**
* This structure contains the active interaction dialogs, and is
* used by the manager
*/
struct
interaction_t
{
VLC_COMMON_MEMBERS
int
i_dialogs
;
///< Number of dialogs
interaction_dialog_t
**
pp_dialogs
;
///< Dialogs
intf_thread_t
*
p_intf
;
///< Interface to use
int
i_last_id
;
///< Last attributed ID
};
/***************************************************************************
/***************************************************************************
* Exported symbols
* Exported symbols
***************************************************************************/
***************************************************************************/
...
...
modules/gui/macosx/interaction.m
View file @
ead147e1
...
@@ -248,7 +248,7 @@
...
@@ -248,7 +248,7 @@
-
(
void
)
sheetDidEnd
:(
NSWindow
*
)
o_sheet
returnCode
:(
int
)
i_return
-
(
void
)
sheetDidEnd
:(
NSWindow
*
)
o_sheet
returnCode
:(
int
)
i_return
contextInfo
:(
void
*
)
o_context
contextInfo
:(
void
*
)
o_context
{
{
vlc_object_lock
(
p_dialog
->
p_interaction
);
vlc_object_lock
(
(
vlc_object_t
*
)(
p_dialog
->
p_interaction
)
);
if
(
i_return
==
NSAlertDefaultReturn
)
if
(
i_return
==
NSAlertDefaultReturn
)
{
{
p_dialog
->
i_return
=
DIALOG_OK_YES
;
p_dialog
->
i_return
=
DIALOG_OK_YES
;
...
@@ -262,7 +262,7 @@
...
@@ -262,7 +262,7 @@
p_dialog
->
i_return
=
DIALOG_CANCELLED
;
p_dialog
->
i_return
=
DIALOG_CANCELLED
;
}
}
p_dialog
->
i_status
=
ANSWERED_DIALOG
;
p_dialog
->
i_status
=
ANSWERED_DIALOG
;
vlc_object_unlock
(
p_dialog
->
p_interaction
);
vlc_object_unlock
(
(
vlc_object_t
*
)(
p_dialog
->
p_interaction
)
);
}
}
-
(
void
)
updateDialog
-
(
void
)
updateDialog
...
@@ -348,10 +348,10 @@
...
@@ -348,10 +348,10 @@
-
(
IBAction
)
cancelAndClose
:(
id
)
sender
-
(
IBAction
)
cancelAndClose
:(
id
)
sender
{
{
/* tell the core that the dialog was cancelled in a yes/no-style dialogue */
/* tell the core that the dialog was cancelled in a yes/no-style dialogue */
vlc_object_lock
(
p_dialog
->
p_interaction
);
vlc_object_lock
(
(
vlc_object_t
*
)(
p_dialog
->
p_interaction
)
);
p_dialog
->
i_return
=
DIALOG_CANCELLED
;
p_dialog
->
i_return
=
DIALOG_CANCELLED
;
p_dialog
->
i_status
=
ANSWERED_DIALOG
;
p_dialog
->
i_status
=
ANSWERED_DIALOG
;
vlc_object_unlock
(
p_dialog
->
p_interaction
);
vlc_object_unlock
(
(
vlc_object_t
*
)(
p_dialog
->
p_interaction
)
);
msg_Dbg
(
p_intf
,
"dialog cancelled"
);
msg_Dbg
(
p_intf
,
"dialog cancelled"
);
}
}
...
@@ -359,16 +359,16 @@
...
@@ -359,16 +359,16 @@
{
{
/* tell core that the user wishes to cancel the dialogue
/* tell core that the user wishes to cancel the dialogue
* Use this function if cancelling is optionally like in the progress-dialogue */
* Use this function if cancelling is optionally like in the progress-dialogue */
vlc_object_lock
(
p_dialog
->
p_interaction
);
vlc_object_lock
(
(
vlc_object_t
*
)(
p_dialog
->
p_interaction
)
);
p_dialog
->
b_cancelled
=
true
;
p_dialog
->
b_cancelled
=
true
;
vlc_object_unlock
(
p_dialog
->
p_interaction
);
vlc_object_unlock
(
(
vlc_object_t
*
)(
p_dialog
->
p_interaction
)
);
msg_Dbg
(
p_intf
,
"cancelling dialog, will close it later on"
);
msg_Dbg
(
p_intf
,
"cancelling dialog, will close it later on"
);
}
}
-
(
IBAction
)
okayAndClose
:(
id
)
sender
-
(
IBAction
)
okayAndClose
:(
id
)
sender
{
{
msg_Dbg
(
p_intf
,
"running okayAndClose"
);
msg_Dbg
(
p_intf
,
"running okayAndClose"
);
vlc_object_lock
(
p_dialog
->
p_interaction
);
vlc_object_lock
(
(
vlc_object_t
*
)(
p_dialog
->
p_interaction
)
);
if
(
p_dialog
->
i_flags
==
DIALOG_LOGIN_PW_OK_CANCEL
)
if
(
p_dialog
->
i_flags
==
DIALOG_LOGIN_PW_OK_CANCEL
)
{
{
p_dialog
->
psz_returned
[
0
]
=
strdup
(
[[
o_auth_login_fld
stringValue
]
UTF8String
]
);
p_dialog
->
psz_returned
[
0
]
=
strdup
(
[[
o_auth_login_fld
stringValue
]
UTF8String
]
);
...
@@ -378,7 +378,7 @@
...
@@ -378,7 +378,7 @@
p_dialog
->
psz_returned
[
0
]
=
strdup
(
[[
o_input_fld
stringValue
]
UTF8String
]
);
p_dialog
->
psz_returned
[
0
]
=
strdup
(
[[
o_input_fld
stringValue
]
UTF8String
]
);
p_dialog
->
i_return
=
DIALOG_OK_YES
;
p_dialog
->
i_return
=
DIALOG_OK_YES
;
p_dialog
->
i_status
=
ANSWERED_DIALOG
;
p_dialog
->
i_status
=
ANSWERED_DIALOG
;
vlc_object_unlock
(
p_dialog
->
p_interaction
);
vlc_object_unlock
(
(
vlc_object_t
*
)(
p_dialog
->
p_interaction
)
);
msg_Dbg
(
p_intf
,
"dialog acknowledged"
);
msg_Dbg
(
p_intf
,
"dialog acknowledged"
);
}
}
...
...
modules/gui/qt4/dialogs/interaction.cpp
View file @
ead147e1
...
@@ -232,7 +232,7 @@ void InteractionDialog::otherB()
...
@@ -232,7 +232,7 @@ void InteractionDialog::otherB()
void
InteractionDialog
::
Finish
(
int
i_ret
)
void
InteractionDialog
::
Finish
(
int
i_ret
)
{
{
vlc_object_lock
(
p_dialog
->
p_interaction
);
vlc_object_lock
(
(
vlc_object_t
*
)(
p_dialog
->
p_interaction
)
);
if
(
p_dialog
->
i_flags
&
DIALOG_LOGIN_PW_OK_CANCEL
)
if
(
p_dialog
->
i_flags
&
DIALOG_LOGIN_PW_OK_CANCEL
)
{
{
...
@@ -252,6 +252,6 @@ void InteractionDialog::Finish( int i_ret )
...
@@ -252,6 +252,6 @@ void InteractionDialog::Finish( int i_ret )
p_dialog
->
b_cancelled
=
true
;
p_dialog
->
b_cancelled
=
true
;
hide
();
hide
();
vlc_object_unlock
(
p_dialog
->
p_interaction
);
vlc_object_unlock
(
(
vlc_object_t
*
)(
p_dialog
->
p_interaction
)
);
}
}
src/interface/interface.h
View file @
ead147e1
...
@@ -34,6 +34,20 @@
...
@@ -34,6 +34,20 @@
* Interaction
* Interaction
**********************************************************************/
**********************************************************************/
/**
* This structure contains the active interaction dialogs, and is
* used by the manager
*/
struct
interaction_t
{
VLC_COMMON_MEMBERS
int
i_dialogs
;
///< Number of dialogs
interaction_dialog_t
**
pp_dialogs
;
///< Dialogs
intf_thread_t
*
p_intf
;
///< Interface to use
int
i_last_id
;
///< Last attributed ID
};
interaction_t
*
interaction_Init
(
libvlc_int_t
*
p_libvlc
);
interaction_t
*
interaction_Init
(
libvlc_int_t
*
p_libvlc
);
void
interaction_Destroy
(
interaction_t
*
);
void
interaction_Destroy
(
interaction_t
*
);
...
...
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