Commit cebd5a0e authored by François Grisez's avatar François Grisez
Browse files

Change variable type of the window ID

parent 4a15e706
......@@ -40,7 +40,7 @@ typedef void (*MSMediaPlayerEofCallback)(void *user_data);
* @param window_id Pointer on the drawing window
* @return A pointer on the created MSMediaPlayer
*/
MS2_PUBLIC MSMediaPlayer *ms_media_player_new(MSSndCard *snd_card, const char *video_display_name, void *window_id);
MS2_PUBLIC MSMediaPlayer *ms_media_player_new(MSSndCard *snd_card, const char *video_display_name, unsigned long window_id);
/**
* @brief Free a media player
......@@ -53,7 +53,7 @@ MS2_PUBLIC void ms_media_player_free(MSMediaPlayer *obj);
* @param obj The player
* @return The window ID
*/
MS2_PUBLIC void *ms_media_player_get_window_id(const MSMediaPlayer *obj);
MS2_PUBLIC unsigned long ms_media_player_get_window_id(const MSMediaPlayer *obj);
/**
* @brief Set the "End of File" callback
......
......@@ -61,7 +61,7 @@ struct _MSMediaPlayer {
ms_mutex_t cb_access;
MSSndCard *snd_card;
char *video_display;
void *window_id;
unsigned long window_id;
};
static bool_t _get_format(const char *filepath, FileFormat *format);
......@@ -89,7 +89,7 @@ static FileFormat four_cc_to_file_format(const FourCC four_cc) {
return FILE_FORMAT_UNKNOWN;
}
MSMediaPlayer *ms_media_player_new(MSSndCard *snd_card, const char *video_display_name, void *window_id) {
MSMediaPlayer *ms_media_player_new(MSSndCard *snd_card, const char *video_display_name, unsigned long window_id) {
MSMediaPlayer *obj = (MSMediaPlayer *)ms_new0(MSMediaPlayer, 1);
obj->ticker = ms_ticker_new();
ms_mutex_init(&obj->cb_access, NULL);
......@@ -108,7 +108,7 @@ void ms_media_player_free(MSMediaPlayer *obj) {
ms_free(obj);
}
void *ms_media_player_get_window_id(const MSMediaPlayer *obj) {
unsigned long ms_media_player_get_window_id(const MSMediaPlayer *obj) {
return obj->window_id;
}
......
......@@ -70,7 +70,7 @@ static void play_file(const char *filepath, bool_t unsupported_format, bool_t se
eof_init(&eof);
file_player = ms_media_player_new(snd_card, display_name, NULL);
file_player = ms_media_player_new(snd_card, display_name, 0);
CU_ASSERT_PTR_NOT_NULL(file_player);
if(file_player == NULL) return;
......
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