From ead147e1fa4f86b668dca1a30c439fe9a510ea4f Mon Sep 17 00:00:00 2001 From: =?utf8?q?R=C3=A9mi=20Denis-Courmont?= Date: Mon, 12 Jan 2009 22:42:30 +0200 Subject: [PATCH] Hide interaction object layout --- include/vlc_interface.h | 14 -------------- modules/gui/macosx/interaction.m | 16 ++++++++-------- modules/gui/qt4/dialogs/interaction.cpp | 4 ++-- src/interface/interface.h | 14 ++++++++++++++ 4 files changed, 24 insertions(+), 24 deletions(-) diff --git a/include/vlc_interface.h b/include/vlc_interface.h index 3053a7a169..f24633bc0f 100644 --- a/include/vlc_interface.h +++ b/include/vlc_interface.h @@ -273,20 +273,6 @@ enum 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 ***************************************************************************/ diff --git a/modules/gui/macosx/interaction.m b/modules/gui/macosx/interaction.m index c62e36c4fc..0f3238f42c 100644 --- a/modules/gui/macosx/interaction.m +++ b/modules/gui/macosx/interaction.m @@ -248,7 +248,7 @@ - (void)sheetDidEnd:(NSWindow *)o_sheet returnCode:(int)i_return 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 ) { p_dialog->i_return = DIALOG_OK_YES; @@ -262,7 +262,7 @@ p_dialog->i_return = DIALOG_CANCELLED; } 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 @@ -348,10 +348,10 @@ - (IBAction)cancelAndClose:(id)sender { /* 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_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" ); } @@ -359,16 +359,16 @@ { /* tell core that the user wishes to cancel the 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; - 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" ); } - (IBAction)okayAndClose:(id)sender { 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 ) { p_dialog->psz_returned[0] = strdup( [[o_auth_login_fld stringValue] UTF8String] ); @@ -378,7 +378,7 @@ p_dialog->psz_returned[0] = strdup( [[o_input_fld stringValue] UTF8String] ); p_dialog->i_return = DIALOG_OK_YES; 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" ); } diff --git a/modules/gui/qt4/dialogs/interaction.cpp b/modules/gui/qt4/dialogs/interaction.cpp index 7c5920f36d..030c63965b 100644 --- a/modules/gui/qt4/dialogs/interaction.cpp +++ b/modules/gui/qt4/dialogs/interaction.cpp @@ -232,7 +232,7 @@ void InteractionDialog::otherB() 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 ) { @@ -252,6 +252,6 @@ void InteractionDialog::Finish( int i_ret ) p_dialog->b_cancelled = true; hide(); - vlc_object_unlock( p_dialog->p_interaction ); + vlc_object_unlock( (vlc_object_t *)(p_dialog->p_interaction) ); } diff --git a/src/interface/interface.h b/src/interface/interface.h index 6401ccdd7f..6c256ca2c9 100644 --- a/src/interface/interface.h +++ b/src/interface/interface.h @@ -34,6 +34,20 @@ * 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 ); void interaction_Destroy( interaction_t * ); -- 2.39.2