Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
GSoC
GSoC2018
macOS
vlc
Commits
d42739f8
Commit
d42739f8
authored
Aug 17, 2006
by
zorglub
Browse files
Fix interaction locking
parent
1b481ca9
Changes
3
Hide whitespace changes
Inline
Side-by-side
modules/gui/qt4/util/qvlcframe.hpp
View file @
d42739f8
...
...
@@ -143,7 +143,8 @@ protected:
{
QSettings
settings
(
"VideoLAN"
,
"VLC"
);
settings
.
beginGroup
(
name
);
resize
(
settings
.
value
(
"size"
,
defSize
).
toSize
()
);
QSize
s
=
settings
.
value
(
"size"
,
defSize
).
toSize
()
;
fprintf
(
stderr
,
"%i %i "
,
s
.
width
(),
s
.
height
()
);
move
(
settings
.
value
(
"pos"
,
QPoint
(
0
,
0
)
).
toPoint
()
);
settings
.
endGroup
();
}
...
...
src/interface/interaction.c
View file @
d42739f8
...
...
@@ -217,7 +217,7 @@ int __intf_UserWarn( vlc_object_t *p_this,
{
va_list
args
;
DIALOG_INIT
(
ONEWAY
);
p_new
->
psz_title
=
strdup
(
psz_title
);
FORMAT_DESC
...
...
@@ -541,7 +541,7 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
if
(
p_this
->
i_flags
&
OBJECT_FLAGS_NOINTERACT
)
return
VLC_EGENERIC
;
if
(
config_GetInt
(
p_this
,
"interact"
)
||
if
(
config_GetInt
(
p_this
,
"interact"
)
||
p_dialog
->
i_flags
&
DIALOG_BLOCKING_ERROR
||
p_dialog
->
i_flags
&
DIALOG_NONBLOCKING_ERROR
)
{
...
...
@@ -568,7 +568,6 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
}
else
p_dialog
->
i_status
=
UPDATED_DIALOG
;
vlc_mutex_unlock
(
&
p_interaction
->
object_lock
);
if
(
p_dialog
->
i_type
==
INTERACT_DIALOG_TWOWAY
)
// Wait for answer
{
...
...
@@ -577,15 +576,17 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
p_dialog
->
i_status
!=
HIDDEN_DIALOG
&&
!
p_dialog
->
p_parent
->
b_die
)
{
vlc_mutex_unlock
(
&
p_interaction
->
object_lock
);
msleep
(
100000
);
vlc_mutex_lock
(
&
p_interaction
->
object_lock
);
}
/// \todo locking ?
if
(
p_dialog
->
p_parent
->
b_die
)
{
p_dialog
->
i_return
=
DIALOG_CANCELLED
;
p_dialog
->
i_status
=
ANSWERED_DIALOG
;
}
p_dialog
->
i_flags
|=
DIALOG_GOT_ANSWER
;
vlc_mutex_unlock
(
&
p_interaction
->
object_lock
);
return
p_dialog
->
i_return
;
}
else
...
...
@@ -598,4 +599,4 @@ static int DialogSend( vlc_object_t *p_this, interaction_dialog_t *p_dialog )
}
else
return
VLC_EGENERIC
;
}
}
test/native/gc.c
View file @
d42739f8
...
...
@@ -29,7 +29,7 @@ static PyObject *gc_test( PyObject *self, PyObject *args )
vlc_gc_decref
(
gc
);
ASSERT
(
gc
->
i_gc_refcount
==
1
,
"Refcount should be 1"
);
vlc_gc_decref
(
gc
);
Py_INCREF
(
Py_None
);
return
Py_None
;
};
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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