*
* You should have received a copy of the GNU General Public License
* along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111, USA.
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston MA 02110-1301, USA.
*****************************************************************************/
+#if !defined( __LIBVLC__ )
+ #error You are not libvlc or one of its plugins. You cannot include this file
+#endif
+
+#ifndef _VLC_THREADS_H_
+#define _VLC_THREADS_H_
+
#include <stdio.h>
#if defined(DEBUG) && defined(HAVE_SYS_TIME_H)
# include <byteorder.h>
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H ) /* pthreads (like Linux & BSD) */
+# define LIBVLC_USE_PTHREAD 1
+# define _APPLE_C_SOURCE 1 /* Proper pthread semantics on OSX */
+
# include <pthread.h>
# ifdef DEBUG
/* Needed for pthread_cond_timedwait */
*****************************************************************************/
/* Thread priorities */
-#ifdef SYS_DARWIN
+#ifdef __APPLE__
# define VLC_THREAD_PRIORITY_LOW (-47)
# define VLC_THREAD_PRIORITY_INPUT 37
# define VLC_THREAD_PRIORITY_AUDIO 37
pth_cond_t cond;
vlc_object_t * p_this;
} vlc_cond_t;
+typedef struct
+{
+ int handle;
+} vlc_threadvar_t;
#elif defined( ST_INIT_IN_ST_H )
typedef st_thread_t vlc_thread_t;
st_cond_t cond;
vlc_object_t * p_this;
} vlc_cond_t;
+typedef struct
+{
+ int handle;
+} vlc_threadvar_t;
#elif defined( WIN32 ) || defined( UNDER_CE )
-typedef HANDLE vlc_thread_t;
+typedef struct
+{
+ /* thread id */
+ DWORD id;
+ /*
+ ** handle to created thread, needs be closed to dispose of it
+ ** even after thread has exited
+ */
+ HANDLE hThread;
+} vlc_thread_t;
+
typedef BOOL (WINAPI *SIGNALOBJECTANDWAIT) ( HANDLE, HANDLE, DWORD, BOOL );
-typedef unsigned (WINAPI *PTHREAD_START) (void *);
typedef struct
{
vlc_object_t * p_this;
} vlc_cond_t;
+typedef struct
+{
+ DWORD handle;
+} vlc_threadvar_t;
+
#elif defined( HAVE_KERNEL_SCHEDULER_H )
/* This is the BeOS implementation of the vlc threads, note that the mutex is
* not a real mutex and the cond_var is not like a pthread cond_var but it is
- * enough for what wee need */
+ * enough for what we need */
typedef thread_id vlc_thread_t;
vlc_object_t * p_this;
} vlc_cond_t;
+typedef struct
+{
+} vlc_threadvar_t;
+
+
#elif defined( PTHREAD_COND_T_IN_PTHREAD_H )
typedef pthread_t vlc_thread_t;
typedef struct
vlc_object_t * p_this;
} vlc_cond_t;
+typedef struct
+{
+ pthread_key_t handle;
+} vlc_threadvar_t;
+
#elif defined( HAVE_CTHREADS_H )
typedef cthread_t vlc_thread_t;
vlc_object_t * p_this;
} vlc_cond_t;
+typedef struct
+{
+ cthread_key_t handle;
+} vlc_threadvar_t;
+
#endif
+#endif