vlc | branch: master | Thomas Guillem <[email protected]> | Tue Aug 13 15:52:42 2019 +0200| [9d25fc2193554d46df24b08b256b999331e18775] | committer: Thomas Guillem
player: rename vlc_player_vout_OSDMessage To vlc_player_osd_Message. > http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=9d25fc2193554d46df24b08b256b999331e18775 --- include/vlc_player.h | 2 +- modules/control/hotkeys.c | 16 +++---- modules/control/rc.c | 4 +- modules/gui/macosx/playlist/VLCPlayerController.m | 2 +- modules/gui/skins2/commands/cmd_quit.cpp | 2 +- src/input/player.c | 51 +++++++++++------------ src/libvlccore.sym | 2 +- src/playlist/control.c | 16 +++---- src/playlist/playlist.h | 2 +- 9 files changed, 48 insertions(+), 49 deletions(-) diff --git a/include/vlc_player.h b/include/vlc_player.h index f0e48536de..401eafd047 100644 --- a/include/vlc_player.h +++ b/include/vlc_player.h @@ -2530,7 +2530,7 @@ vlc_player_vout_Snapshot(vlc_player_t *player); * @param fmt format string */ VLC_API void -vlc_player_vout_OSDMessage(vlc_player_t *player, const char *fmt, ...); +vlc_player_osd_Message(vlc_player_t *player, const char *fmt, ...); /** @} vlc_player__vout */ diff --git a/modules/control/hotkeys.c b/modules/control/hotkeys.c index f4e06fdbc3..f03c864e2e 100644 --- a/modules/control/hotkeys.c +++ b/modules/control/hotkeys.c @@ -582,7 +582,7 @@ PLAYER_ACTION_HANDLER(ControlSubtitleSecondary) sys->spu_channel_order == VLC_VOUT_ORDER_PRIMARY ? VLC_VOUT_ORDER_SECONDARY : VLC_VOUT_ORDER_PRIMARY; - vlc_player_vout_OSDMessage(player, _("%s subtitle control"), + vlc_player_osd_Message(player, _("%s subtitle control"), sys->spu_channel_order == VLC_VOUT_ORDER_PRIMARY ? "Primary" : "Secondary"); } @@ -594,18 +594,18 @@ PLAYER_ACTION_HANDLER(SyncSubtitle) { case ACTIONID_SUBSYNC_MARKAUDIO: sys->subsync.audio_time = vlc_tick_now(); - vlc_player_vout_OSDMessage(player, _("Sub sync: bookmarked audio time")); + vlc_player_osd_Message(player, _("Sub sync: bookmarked audio time")); break; case ACTIONID_SUBSYNC_MARKSUB: sys->subsync.subtitle_time = vlc_tick_now(); - vlc_player_vout_OSDMessage(player, _("Sub sync: bookmarked subtitle time")); + vlc_player_osd_Message(player, _("Sub sync: bookmarked subtitle time")); break; case ACTIONID_SUBSYNC_APPLY: { if (sys->subsync.audio_time == VLC_TICK_INVALID || sys->subsync.subtitle_time == VLC_TICK_INVALID) { - vlc_player_vout_OSDMessage(player, _("Sub sync: set bookmarks first!")); + vlc_player_osd_Message(player, _("Sub sync: set bookmarks first!")); break; } vlc_tick_t delay = @@ -618,8 +618,8 @@ PLAYER_ACTION_HANDLER(SyncSubtitle) long long delay_ms = MS_FROM_VLC_TICK(delay); long long totdelay_ms = MS_FROM_VLC_TICK(previous_delay + delay); - vlc_player_vout_OSDMessage(player, _("Sub sync: corrected %"PRId64 - " ms (total delay = %"PRId64" ms)"), + vlc_player_osd_Message(player, _("Sub sync: corrected %"PRId64 + " ms (total delay = %"PRId64" ms)"), delay_ms, totdelay_ms); break; } @@ -627,7 +627,7 @@ PLAYER_ACTION_HANDLER(SyncSubtitle) sys->subsync.audio_time = VLC_TICK_INVALID; sys->subsync.subtitle_time = VLC_TICK_INVALID; vlc_player_SetSubtitleDelay(player, 0, VLC_PLAYER_WHENCE_ABSOLUTE); - vlc_player_vout_OSDMessage(player, _("Sub sync: delay reset")); + vlc_player_osd_Message(player, _("Sub sync: delay reset")); break; default: vlc_assert_unreachable(); @@ -746,7 +746,7 @@ PLAYER_ACTION_HANDLER(Aout) char *devname; if (!AudioDeviceCycle(aout, &devname)) { - vlc_player_vout_OSDMessage(player, _("Audio device: %s"), devname); + vlc_player_osd_Message(player, _("Audio device: %s"), devname); free(devname); } aout_Release(aout); diff --git a/modules/control/rc.c b/modules/control/rc.c index 5de30ea119..29382cda56 100644 --- a/modules/control/rc.c +++ b/modules/control/rc.c @@ -1110,8 +1110,8 @@ static void AudioDevice(intf_thread_t *intf, char const *cmd, if (!strcmp(cur.psz_string, ids[i])) break; if (i < n) - vlc_player_vout_OSDMessage(player, - _("Audio device: %s"), names[i]); + vlc_player_osd_Message(player, + _("Audio device: %s"), names[i]); } else { diff --git a/modules/gui/macosx/playlist/VLCPlayerController.m b/modules/gui/macosx/playlist/VLCPlayerController.m index cacf72eb9a..7401a1be02 100644 --- a/modules/gui/macosx/playlist/VLCPlayerController.m +++ b/modules/gui/macosx/playlist/VLCPlayerController.m @@ -1652,7 +1652,7 @@ static const struct vlc_player_aout_cbs player_aout_callbacks = { - (void)displayOSDMessage:(NSString *)message { - vlc_player_vout_OSDMessage(_p_player, [message UTF8String]); + vlc_player_osd_Message(_p_player, [message UTF8String]); } - (void)setAspectRatioIsLocked:(BOOL)b_value diff --git a/modules/gui/skins2/commands/cmd_quit.cpp b/modules/gui/skins2/commands/cmd_quit.cpp index b035f88edb..1d3d59806f 100644 --- a/modules/gui/skins2/commands/cmd_quit.cpp +++ b/modules/gui/skins2/commands/cmd_quit.cpp @@ -36,7 +36,7 @@ void CmdQuit::execute() { vlc_player_t *player = vlc_playlist_GetPlayer( getPL() ); - vlc_player_vout_OSDMessage( player, + vlc_player_osd_Message( player, VOUT_SPU_CHANNEL_OSD, "%s", _( "Quit" ) ); // Kill libvlc diff --git a/src/input/player.c b/src/input/player.c index 29c60a87d7..7176303c7e 100644 --- a/src/input/player.c +++ b/src/input/player.c @@ -311,7 +311,7 @@ vouts_osd_Slider(vout_thread_t **vouts, size_t count, int position, short type) } void -vlc_player_vout_OSDMessage(vlc_player_t *player, const char *fmt, ...) +vlc_player_osd_Message(vlc_player_t *player, const char *fmt, ...) { size_t count; vout_thread_t **vouts = vlc_player_vout_OSDHoldAll(player, &count); @@ -1130,7 +1130,7 @@ vlc_player_GetProgram(vlc_player_t *player, int id) static inline void vlc_player_vout_OSDProgram(vlc_player_t *player, const char *name) { - vlc_player_vout_OSDMessage(player, _("Program Service ID: %s"), name); + vlc_player_osd_Message(player, _("Program Service ID: %s"), name); } void @@ -1440,7 +1440,7 @@ vlc_player_vout_OSDTrack(vlc_player_t *player, vlc_es_id_t *id, bool select) const char *cat_name = es_format_category_to_string(cat); assert(cat_name); const char *track_name = select ? track->name : _("N/A"); - vlc_player_vout_OSDMessage(player, _("%s track: %s"), cat_name, track_name); + vlc_player_osd_Message(player, _("%s track: %s"), cat_name, track_name); } unsigned @@ -1502,8 +1502,7 @@ vlc_player_SelectEsIdList(vlc_player_t *player, /* Display track selection message */ const char *cat_name = es_format_category_to_string(cat); if (track_count == 0) - vlc_player_vout_OSDMessage(player, _("%s track: %s"), cat_name, - _("N/A")); + vlc_player_osd_Message(player, _("%s track: %s"), cat_name, _("N/A")); else if (track_count == 1) vlc_player_vout_OSDTrack(player, es_id_list[0], true); else @@ -1524,8 +1523,8 @@ vlc_player_SelectEsIdList(vlc_player_t *player, } if (vlc_memstream_close(&stream) == 0) { - vlc_player_vout_OSDMessage(player, _("%s tracks: %s"), cat_name, - stream.ptr); + vlc_player_osd_Message(player, _("%s tracks: %s"), cat_name, + stream.ptr); free(stream.ptr); } } @@ -2042,7 +2041,7 @@ vlc_player_SelectNextTitle(vlc_player_t *player) if (!input) return; input_ControlPush(input->thread, INPUT_CONTROL_SET_TITLE_NEXT, NULL); - vlc_player_vout_OSDMessage(player, _("Next title")); + vlc_player_osd_Message(player, _("Next title")); } void @@ -2052,7 +2051,7 @@ vlc_player_SelectPrevTitle(vlc_player_t *player) if (!input) return; input_ControlPush(input->thread, INPUT_CONTROL_SET_TITLE_PREV, NULL); - vlc_player_vout_OSDMessage(player, _("Previous title")); + vlc_player_osd_Message(player, _("Previous title")); } ssize_t @@ -2073,7 +2072,7 @@ vlc_player_SelectChapterIdx(vlc_player_t *player, size_t index) return; input_ControlPushHelper(input->thread, INPUT_CONTROL_SET_SEEKPOINT, &(vlc_value_t){ .i_int = index }); - vlc_player_vout_OSDMessage(player, _("Chapter %ld"), index); + vlc_player_osd_Message(player, _("Chapter %ld"), index); } void @@ -2083,7 +2082,7 @@ vlc_player_SelectNextChapter(vlc_player_t *player) if (!input) return; input_ControlPush(input->thread, INPUT_CONTROL_SET_SEEKPOINT_NEXT, NULL); - vlc_player_vout_OSDMessage(player, _("Next chapter")); + vlc_player_osd_Message(player, _("Next chapter")); } void @@ -2093,7 +2092,7 @@ vlc_player_SelectPrevChapter(vlc_player_t *player) if (!input) return; input_ControlPush(input->thread, INPUT_CONTROL_SET_SEEKPOINT_PREV, NULL); - vlc_player_vout_OSDMessage(player, _("Previous chapter")); + vlc_player_osd_Message(player, _("Previous chapter")); } static void @@ -2446,12 +2445,12 @@ vlc_player_AddAssociatedMedia(vlc_player_t *player, switch( type ) { case SLAVE_TYPE_AUDIO: - vlc_player_vout_OSDMessage(player, "%s", - vlc_gettext("Audio track added")); + vlc_player_osd_Message(player, "%s", + vlc_gettext("Audio track added")); break; case SLAVE_TYPE_SPU: - vlc_player_vout_OSDMessage(player, "%s", - vlc_gettext("Subtitle track added")); + vlc_player_osd_Message(player, "%s", + vlc_gettext("Subtitle track added")); break; } } @@ -2608,7 +2607,7 @@ vlc_player_NextVideoFrame(vlc_player_t *player) if (!input) return; input_ControlPushHelper(input->thread, INPUT_CONTROL_SET_FRAME_NEXT, NULL); - vlc_player_vout_OSDMessage(player, _("Next frame")); + vlc_player_osd_Message(player, _("Next frame")); } enum vlc_player_state @@ -2661,7 +2660,7 @@ vlc_player_ChangeRate(vlc_player_t *player, float rate) else vlc_player_SendEvent(player, on_rate_changed, rate); - vlc_player_vout_OSDMessage(player, ("Speed: %.2fx"), rate); + vlc_player_osd_Message(player, ("Speed: %.2fx"), rate); } static void @@ -3026,8 +3025,8 @@ vlc_player_SetRecordingEnabled(vlc_player_t *player, bool enable) input_ControlPushHelper(input->thread, INPUT_CONTROL_SET_RECORD_STATE, &(vlc_value_t) { .b_bool = enable }); - vlc_player_vout_OSDMessage(player, enable ? - _("Recording") : _("Recording done")); + vlc_player_osd_Message(player, enable ? + _("Recording") : _("Recording done")); } int @@ -3053,9 +3052,9 @@ vlc_player_SetCategoryDelay(vlc_player_t *player, enum es_format_category_e cat, const input_control_param_t param = { .cat_delay = { cat, delay } }; input_ControlPush(input->thread, INPUT_CONTROL_SET_CATEGORY_DELAY, ¶m); - vlc_player_vout_OSDMessage(player, _("%s delay: %i ms"), - es_format_category_to_string(cat), - (int)MS_FROM_VLC_TICK(delay)); + vlc_player_osd_Message(player, _("%s delay: %i ms"), + es_format_category_to_string(cat), + (int)MS_FROM_VLC_TICK(delay)); vlc_player_SendEvent(player, on_category_delay_changed, cat, delay); return VLC_SUCCESS; } @@ -3101,9 +3100,9 @@ vlc_player_SetEsIdDelay(vlc_player_t *player, vlc_es_id_t *es_id, const input_control_param_t param = { .es_delay = { es_id, delay } }; input_ControlPush(input->thread, INPUT_CONTROL_SET_ES_DELAY, ¶m); if (delay != INT64_MAX) - vlc_player_vout_OSDMessage(player, _("%s delay: %i ms"), - trackpriv->t.name, - (int)MS_FROM_VLC_TICK(delay)); + vlc_player_osd_Message(player, _("%s delay: %i ms"), + trackpriv->t.name, + (int)MS_FROM_VLC_TICK(delay)); vlc_player_SendEvent(player, on_track_delay_changed, es_id, delay); return VLC_SUCCESS; diff --git a/src/libvlccore.sym b/src/libvlccore.sym index c3f7dbbd1f..f278fe6e9d 100644 --- a/src/libvlccore.sym +++ b/src/libvlccore.sym @@ -819,6 +819,7 @@ vlc_player_Lock vlc_player_Navigate vlc_player_New vlc_player_NextVideoFrame +vlc_player_osd_Message vlc_player_Pause vlc_player_program_Delete vlc_player_program_Dup @@ -873,7 +874,6 @@ vlc_player_vout_Hold vlc_player_vout_HoldAll vlc_player_vout_IsFullscreen vlc_player_vout_IsWallpaperModeEnabled -vlc_player_vout_OSDMessage vlc_player_vout_RemoveListener vlc_player_vout_SetFullscreen vlc_player_vout_SetWallpaperModeEnabled diff --git a/src/playlist/control.c b/src/playlist/control.c index eb1ee18a52..c4c859efa5 100644 --- a/src/playlist/control.c +++ b/src/playlist/control.c @@ -65,9 +65,9 @@ vlc_playlist_PlaybackOrderChanged(vlc_playlist_t *playlist) state_text = N_("On"); break; } - vlc_player_vout_OSDMessage(playlist->player, - _("Random: %s"), vlc_gettext(state_text)); - /* vlc_player_vout_OSDMessage() does nothing in tests */ + vlc_player_osd_Message(playlist->player, + _("Random: %s"), vlc_gettext(state_text)); + /* vlc_player_osd_Message() does nothing in tests */ VLC_UNUSED(state_text); } @@ -102,9 +102,9 @@ vlc_playlist_PlaybackRepeatChanged(vlc_playlist_t *playlist) state_text = N_("One"); break; } - vlc_player_vout_OSDMessage(playlist->player, - _("Loop: %s"), vlc_gettext(state_text)); - /* vlc_player_vout_OSDMessage() does nothing in tests */ + vlc_player_osd_Message(playlist->player, + _("Loop: %s"), vlc_gettext(state_text)); + /* vlc_player_osd_Message() does nothing in tests */ VLC_UNUSED(state_text); } @@ -369,7 +369,7 @@ vlc_playlist_Prev(vlc_playlist_t *playlist) } vlc_playlist_SetCurrentIndex(playlist, index); - vlc_player_vout_OSDMessage(playlist->player, _("Previous")); + vlc_player_osd_Message(playlist->player, _("Previous")); return VLC_SUCCESS; } @@ -397,7 +397,7 @@ vlc_playlist_Next(vlc_playlist_t *playlist) } vlc_playlist_SetCurrentIndex(playlist, index); - vlc_player_vout_OSDMessage(playlist->player, _("Next")); + vlc_player_osd_Message(playlist->player, _("Next")); return VLC_SUCCESS; } diff --git a/src/playlist/playlist.h b/src/playlist/playlist.h index ef476f0597..eb6210dbf1 100644 --- a/src/playlist/playlist.h +++ b/src/playlist/playlist.h @@ -40,7 +40,7 @@ typedef struct input_item_t input_item_t; # define vlc_player_RemoveListener(a,b) free(b) # define vlc_player_SetCurrentMedia(a,b) (VLC_UNUSED(b), VLC_SUCCESS) # define vlc_player_InvalidateNextMedia(p) VLC_UNUSED(p) -# define vlc_player_vout_OSDMessage(p, fmt...) VLC_UNUSED(p) +# define vlc_player_osd_Message(p, fmt...) VLC_UNUSED(p) #endif /* TEST_PLAYLIST */ typedef struct VLC_VECTOR(vlc_playlist_item_t *) playlist_item_vector_t; _______________________________________________ vlc-commits mailing list [email protected] https://mailman.videolan.org/listinfo/vlc-commits
