This reverts commit e51d033c.

Conflicts:

	include/vlc/libvlc_events.h
	src/control/media_player.c
	src/control/media_player_internal.h