Commit 1824f98c authored by Ghislain MARY's avatar Ghislain MARY
Browse files

Also use void* window ids for media player.

parent 974a4042
...@@ -51,7 +51,7 @@ extern "C"{ ...@@ -51,7 +51,7 @@ extern "C"{
* @param window_id Pointer on the drawing window * @param window_id Pointer on the drawing window
* @return A pointer on the created MSMediaPlayer * @return A pointer on the created MSMediaPlayer
*/ */
MS2_PUBLIC MSMediaPlayer *ms_media_player_new(MSSndCard *snd_card, const char *video_display_name, unsigned long window_id); MS2_PUBLIC MSMediaPlayer *ms_media_player_new(MSSndCard *snd_card, const char *video_display_name, void *window_id);
/** /**
* @brief Free a media player * @brief Free a media player
...@@ -64,7 +64,7 @@ MS2_PUBLIC void ms_media_player_free(MSMediaPlayer *obj); ...@@ -64,7 +64,7 @@ MS2_PUBLIC void ms_media_player_free(MSMediaPlayer *obj);
* @param obj The player * @param obj The player
* @return The window ID * @return The window ID
*/ */
MS2_PUBLIC unsigned long ms_media_player_get_window_id(const MSMediaPlayer *obj); MS2_PUBLIC void * ms_media_player_get_window_id(const MSMediaPlayer *obj);
/** /**
* @brief Set the "End of File" callback * @brief Set the "End of File" callback
......
...@@ -55,7 +55,7 @@ struct _MSMediaPlayer { ...@@ -55,7 +55,7 @@ struct _MSMediaPlayer {
ms_mutex_t cb_access; ms_mutex_t cb_access;
MSSndCard *snd_card; MSSndCard *snd_card;
char *video_display; char *video_display;
unsigned long window_id; void *window_id;
}; };
static bool_t _get_format(const char *filepath, MSFileFormat *format); static bool_t _get_format(const char *filepath, MSFileFormat *format);
...@@ -83,7 +83,7 @@ static MSFileFormat four_cc_to_file_format(const FourCC four_cc) { ...@@ -83,7 +83,7 @@ static MSFileFormat four_cc_to_file_format(const FourCC four_cc) {
return MS_FILE_FORMAT_UNKNOWN; return MS_FILE_FORMAT_UNKNOWN;
} }
MSMediaPlayer *ms_media_player_new(MSSndCard *snd_card, const char *video_display_name, unsigned long window_id) { MSMediaPlayer *ms_media_player_new(MSSndCard *snd_card, const char *video_display_name, void *window_id) {
MSMediaPlayer *obj = (MSMediaPlayer *)ms_new0(MSMediaPlayer, 1); MSMediaPlayer *obj = (MSMediaPlayer *)ms_new0(MSMediaPlayer, 1);
obj->ticker = ms_ticker_new(); obj->ticker = ms_ticker_new();
ms_mutex_init(&obj->cb_access, NULL); ms_mutex_init(&obj->cb_access, NULL);
...@@ -102,7 +102,7 @@ void ms_media_player_free(MSMediaPlayer *obj) { ...@@ -102,7 +102,7 @@ void ms_media_player_free(MSMediaPlayer *obj) {
ms_free(obj); ms_free(obj);
} }
unsigned long ms_media_player_get_window_id(const MSMediaPlayer *obj) { void * ms_media_player_get_window_id(const MSMediaPlayer *obj) {
return obj->window_id; return obj->window_id;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment