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
d84370a8
Commit
d84370a8
authored
Feb 08, 2010
by
Antoine Cellerier
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix VLM scheduling.
parent
2fcddc86
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
6 deletions
+8
-6
src/input/vlm.c
src/input/vlm.c
+2
-2
src/input/vlmshell.c
src/input/vlmshell.c
+6
-4
No files found.
src/input/vlm.c
View file @
d84370a8
...
@@ -147,7 +147,7 @@ vlm_t *vlm_New ( vlc_object_t *p_this )
...
@@ -147,7 +147,7 @@ vlm_t *vlm_New ( vlc_object_t *p_this )
vlc_mutex_init
(
&
p_vlm
->
lock
);
vlc_mutex_init
(
&
p_vlm
->
lock
);
vlc_mutex_init
(
&
p_vlm
->
lock_manage
);
vlc_mutex_init
(
&
p_vlm
->
lock_manage
);
vlc_cond_init
(
&
p_vlm
->
wait_manage
);
vlc_cond_init
_daytime
(
&
p_vlm
->
wait_manage
);
p_vlm
->
i_id
=
1
;
p_vlm
->
i_id
=
1
;
TAB_INIT
(
p_vlm
->
i_media
,
p_vlm
->
media
);
TAB_INIT
(
p_vlm
->
i_media
,
p_vlm
->
media
);
TAB_INIT
(
p_vlm
->
i_schedule
,
p_vlm
->
schedule
);
TAB_INIT
(
p_vlm
->
i_schedule
,
p_vlm
->
schedule
);
...
@@ -375,7 +375,7 @@ static void* Manage( void* p_object )
...
@@ -375,7 +375,7 @@ static void* Manage( void* p_object )
vlc_mutex_lock
(
&
vlm
->
lock_manage
);
vlc_mutex_lock
(
&
vlm
->
lock_manage
);
if
(
i_nextschedule
)
if
(
i_nextschedule
)
vlc_cond_timedwait
(
&
vlm
->
wait_manage
,
&
vlm
->
lock_manage
,
i_nextschedule
-
mdate
()
);
vlc_cond_timedwait
(
&
vlm
->
wait_manage
,
&
vlm
->
lock_manage
,
i_nextschedule
);
else
else
vlc_cond_wait
(
&
vlm
->
wait_manage
,
&
vlm
->
lock_manage
);
vlc_cond_wait
(
&
vlm
->
wait_manage
,
&
vlm
->
lock_manage
);
vlc_mutex_unlock
(
&
vlm
->
lock_manage
);
vlc_mutex_unlock
(
&
vlm
->
lock_manage
);
...
...
src/input/vlmshell.c
View file @
d84370a8
...
@@ -664,6 +664,11 @@ static int ExecuteScheduleProperty( vlm_t *p_vlm, vlm_schedule_sys_t *p_schedule
...
@@ -664,6 +664,11 @@ static int ExecuteScheduleProperty( vlm_t *p_vlm, vlm_schedule_sys_t *p_schedule
}
}
}
}
*
pp_status
=
vlm_MessageSimpleNew
(
psz_cmd
);
*
pp_status
=
vlm_MessageSimpleNew
(
psz_cmd
);
vlc_mutex_lock
(
&
p_vlm
->
lock_manage
);
vlc_cond_signal
(
&
p_vlm
->
wait_manage
);
vlc_mutex_unlock
(
&
p_vlm
->
lock_manage
);
return
VLC_SUCCESS
;
return
VLC_SUCCESS
;
error:
error:
...
@@ -996,10 +1001,6 @@ static vlm_schedule_sys_t *vlm_ScheduleNew( vlm_t *vlm, const char *psz_name )
...
@@ -996,10 +1001,6 @@ static vlm_schedule_sys_t *vlm_ScheduleNew( vlm_t *vlm, const char *psz_name )
TAB_APPEND
(
vlm
->
i_schedule
,
vlm
->
schedule
,
p_sched
);
TAB_APPEND
(
vlm
->
i_schedule
,
vlm
->
schedule
,
p_sched
);
vlc_mutex_lock
(
&
vlm
->
lock_manage
);
vlc_cond_signal
(
&
vlm
->
wait_manage
);
vlc_mutex_unlock
(
&
vlm
->
lock_manage
);
return
p_sched
;
return
p_sched
;
}
}
...
@@ -1217,6 +1218,7 @@ static int vlm_ScheduleSetup( vlm_schedule_sys_t *schedule, const char *psz_cmd,
...
@@ -1217,6 +1218,7 @@ static int vlm_ScheduleSetup( vlm_schedule_sys_t *schedule, const char *psz_cmd,
{
{
return
1
;
return
1
;
}
}
return
0
;
return
0
;
}
}
...
...
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