Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
V
vlc-1.1
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-1.1
Commits
c92a7456
Commit
c92a7456
authored
Aug 18, 2007
by
Rafaël Carré
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Prevents deadlocks with input in qt4
parent
82526952
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
4 deletions
+2
-4
modules/gui/qt4/components/infopanels.cpp
modules/gui/qt4/components/infopanels.cpp
+2
-0
modules/gui/qt4/dialogs/mediainfo.cpp
modules/gui/qt4/dialogs/mediainfo.cpp
+0
-4
No files found.
modules/gui/qt4/components/infopanels.cpp
View file @
c92a7456
...
@@ -288,6 +288,7 @@ ExtraMetaPanel::ExtraMetaPanel( QWidget *parent,
...
@@ -288,6 +288,7 @@ ExtraMetaPanel::ExtraMetaPanel( QWidget *parent,
**/
**/
void
ExtraMetaPanel
::
update
(
input_item_t
*
p_item
)
void
ExtraMetaPanel
::
update
(
input_item_t
*
p_item
)
{
{
vlc_mutex_lock
(
&
p_item
->
lock
);
vlc_meta_t
*
p_meta
=
p_item
->
p_meta
;
vlc_meta_t
*
p_meta
=
p_item
->
p_meta
;
if
(
!
p_meta
)
if
(
!
p_meta
)
return
;
return
;
...
@@ -305,6 +306,7 @@ void ExtraMetaPanel::update( input_item_t *p_item )
...
@@ -305,6 +306,7 @@ void ExtraMetaPanel::update( input_item_t *p_item )
items
.
append
(
new
QTreeWidgetItem
(
extraMetaTree
,
tempItem
)
);
items
.
append
(
new
QTreeWidgetItem
(
extraMetaTree
,
tempItem
)
);
free
(
ppsz_allkey
[
i
]
);
free
(
ppsz_allkey
[
i
]
);
}
}
vlc_mutex_unlock
(
&
p_item
->
lock
);
free
(
ppsz_allkey
);
free
(
ppsz_allkey
);
extraMetaTree
->
addTopLevelItems
(
items
);
extraMetaTree
->
addTopLevelItems
(
items
);
}
}
...
...
modules/gui/qt4/dialogs/mediainfo.cpp
View file @
c92a7456
...
@@ -123,9 +123,7 @@ static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
...
@@ -123,9 +123,7 @@ static int ItemChanged( vlc_object_t *p_this, const char *psz_var,
void
MediaInfoDialog
::
setInput
(
input_item_t
*
p_input
)
void
MediaInfoDialog
::
setInput
(
input_item_t
*
p_input
)
{
{
clear
();
clear
();
vlc_mutex_lock
(
&
p_input
->
lock
);
update
(
p_input
,
true
,
true
);
update
(
p_input
,
true
,
true
);
vlc_mutex_unlock
(
&
p_input
->
lock
);
}
}
void
MediaInfoDialog
::
update
()
void
MediaInfoDialog
::
update
()
...
@@ -144,12 +142,10 @@ void MediaInfoDialog::update()
...
@@ -144,12 +142,10 @@ void MediaInfoDialog::update()
}
}
vlc_object_yield
(
p_input
);
vlc_object_yield
(
p_input
);
vlc_mutex_lock
(
&
input_GetItem
(
p_input
)
->
lock
);
update
(
input_GetItem
(
p_input
),
need_update
,
need_update
);
update
(
input_GetItem
(
p_input
),
need_update
,
need_update
);
need_update
=
false
;
need_update
=
false
;
vlc_mutex_unlock
(
&
input_GetItem
(
p_input
)
->
lock
);
vlc_object_release
(
p_input
);
vlc_object_release
(
p_input
);
}
}
...
...
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