mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-30 20:59:44 +00:00
some cleanup and compile fixes
Original commit message from CVS: some cleanup and compile fixes
This commit is contained in:
parent
9b6906c4df
commit
1abf5ae7a6
2 changed files with 5 additions and 7 deletions
|
@ -136,10 +136,7 @@ gst_thread_init (GstThread *thread)
|
|||
GST_FLAG_SET (thread, GST_BIN_FLAG_MANAGER);
|
||||
|
||||
// default is to create a thread
|
||||
GST_FLAG_UNSET (thread, GST_THREAD_STATE_STARTED);
|
||||
GST_FLAG_UNSET (thread, GST_THREAD_STATE_REAPING);
|
||||
GST_FLAG_UNSET (thread, GST_THREAD_STATE_SPINNING);
|
||||
GST_FLAG_UNSET (thread, GST_THREAD_STATE_ELEMENT_CHANGED);
|
||||
GST_FLAG_SET (thread, GST_THREAD_CREATE);
|
||||
|
||||
thread->lock = g_mutex_new();
|
||||
thread->cond = g_cond_new();
|
||||
|
@ -299,7 +296,7 @@ gst_thread_change_state (GstElement *element)
|
|||
//GST_FLAG_SET (thread, GST_THREAD_STATE_REAPING);
|
||||
gst_thread_signal_thread (thread,GST_THREAD_STATE_REAPING);
|
||||
|
||||
pthread_join(thread->thread_id);
|
||||
pthread_join(thread->thread_id,NULL);
|
||||
|
||||
GST_FLAG_UNSET(thread,GST_THREAD_STATE_REAPING);
|
||||
GST_FLAG_UNSET(thread,GST_THREAD_STATE_STARTED);
|
||||
|
@ -369,7 +366,6 @@ gst_thread_main_loop (void *arg)
|
|||
gst_thread_signal_thread (thread,GST_THREAD_STATE_ELEMENT_CHANGED);
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
GST_INFO (GST_CAT_THREAD, "gstthread: thread \"%s\" is stopped",
|
||||
GST_ELEMENT_NAME (thread));
|
||||
|
|
|
@ -37,7 +37,9 @@ extern GstElementDetails gst_thread_details;
|
|||
|
||||
|
||||
typedef enum {
|
||||
GST_THREAD_STATE_STARTED = GST_BIN_FLAG_LAST,
|
||||
GST_THREAD_CREATE = GST_BIN_FLAG_LAST,
|
||||
|
||||
GST_THREAD_STATE_STARTED,
|
||||
GST_THREAD_STATE_SPINNING,
|
||||
GST_THREAD_STATE_REAPING,
|
||||
GST_THREAD_STATE_ELEMENT_CHANGED,
|
||||
|
|
Loading…
Reference in a new issue