Skip to content

Commit 9d25fc2

Browse files
tguillemtguillem
committed
player: rename vlc_player_vout_OSDMessage
To vlc_player_osd_Message.
1 parent 3d0cabd commit 9d25fc2

File tree

9 files changed

+48
-49
lines changed

9 files changed

+48
-49
lines changed

‎include/vlc_player.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2530,7 +2530,7 @@ vlc_player_vout_Snapshot(vlc_player_t *player);
25302530
* @param fmt format string
25312531
*/
25322532
VLC_API void
2533-
vlc_player_vout_OSDMessage(vlc_player_t *player, const char *fmt, ...);
2533+
vlc_player_osd_Message(vlc_player_t *player, const char *fmt, ...);
25342534

25352535
/** @} vlc_player__vout */
25362536

‎modules/control/hotkeys.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -582,7 +582,7 @@ PLAYER_ACTION_HANDLER(ControlSubtitleSecondary)
582582
sys->spu_channel_order == VLC_VOUT_ORDER_PRIMARY ?
583583
VLC_VOUT_ORDER_SECONDARY : VLC_VOUT_ORDER_PRIMARY;
584584

585-
vlc_player_vout_OSDMessage(player, _("%s subtitle control"),
585+
vlc_player_osd_Message(player, _("%s subtitle control"),
586586
sys->spu_channel_order == VLC_VOUT_ORDER_PRIMARY ? "Primary" : "Secondary");
587587
}
588588

@@ -594,18 +594,18 @@ PLAYER_ACTION_HANDLER(SyncSubtitle)
594594
{
595595
case ACTIONID_SUBSYNC_MARKAUDIO:
596596
sys->subsync.audio_time = vlc_tick_now();
597-
vlc_player_vout_OSDMessage(player, _("Sub sync: bookmarked audio time"));
597+
vlc_player_osd_Message(player, _("Sub sync: bookmarked audio time"));
598598
break;
599599
case ACTIONID_SUBSYNC_MARKSUB:
600600
sys->subsync.subtitle_time = vlc_tick_now();
601-
vlc_player_vout_OSDMessage(player, _("Sub sync: bookmarked subtitle time"));
601+
vlc_player_osd_Message(player, _("Sub sync: bookmarked subtitle time"));
602602
break;
603603
case ACTIONID_SUBSYNC_APPLY:
604604
{
605605
if (sys->subsync.audio_time == VLC_TICK_INVALID ||
606606
sys->subsync.subtitle_time == VLC_TICK_INVALID)
607607
{
608-
vlc_player_vout_OSDMessage(player, _("Sub sync: set bookmarks first!"));
608+
vlc_player_osd_Message(player, _("Sub sync: set bookmarks first!"));
609609
break;
610610
}
611611
vlc_tick_t delay =
@@ -618,16 +618,16 @@ PLAYER_ACTION_HANDLER(SyncSubtitle)
618618

619619
long long delay_ms = MS_FROM_VLC_TICK(delay);
620620
long long totdelay_ms = MS_FROM_VLC_TICK(previous_delay + delay);
621-
vlc_player_vout_OSDMessage(player, _("Sub sync: corrected %"PRId64
622-
" ms (total delay = %"PRId64" ms)"),
621+
vlc_player_osd_Message(player, _("Sub sync: corrected %"PRId64
622+
" ms (total delay = %"PRId64" ms)"),
623623
delay_ms, totdelay_ms);
624624
break;
625625
}
626626
case ACTIONID_SUBSYNC_RESET:
627627
sys->subsync.audio_time = VLC_TICK_INVALID;
628628
sys->subsync.subtitle_time = VLC_TICK_INVALID;
629629
vlc_player_SetSubtitleDelay(player, 0, VLC_PLAYER_WHENCE_ABSOLUTE);
630-
vlc_player_vout_OSDMessage(player, _("Sub sync: delay reset"));
630+
vlc_player_osd_Message(player, _("Sub sync: delay reset"));
631631
break;
632632
default:
633633
vlc_assert_unreachable();
@@ -746,7 +746,7 @@ PLAYER_ACTION_HANDLER(Aout)
746746
char *devname;
747747
if (!AudioDeviceCycle(aout, &devname))
748748
{
749-
vlc_player_vout_OSDMessage(player, _("Audio device: %s"), devname);
749+
vlc_player_osd_Message(player, _("Audio device: %s"), devname);
750750
free(devname);
751751
}
752752
aout_Release(aout);

‎modules/control/rc.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1110,8 +1110,8 @@ static void AudioDevice(intf_thread_t *intf, char const *cmd,
11101110
if (!strcmp(cur.psz_string, ids[i]))
11111111
break;
11121112
if (i < n)
1113-
vlc_player_vout_OSDMessage(player,
1114-
_("Audio device: %s"), names[i]);
1113+
vlc_player_osd_Message(player,
1114+
_("Audio device: %s"), names[i]);
11151115
}
11161116
else
11171117
{

‎modules/gui/macosx/playlist/VLCPlayerController.m

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1652,7 +1652,7 @@ - (vout_thread_t *)videoOutputThreadForKeyWindow
16521652

16531653
- (void)displayOSDMessage:(NSString *)message
16541654
{
1655-
vlc_player_vout_OSDMessage(_p_player, [message UTF8String]);
1655+
vlc_player_osd_Message(_p_player, [message UTF8String]);
16561656
}
16571657

16581658
- (void)setAspectRatioIsLocked:(BOOL)b_value

‎modules/gui/skins2/commands/cmd_quit.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
void CmdQuit::execute()
3737
{
3838
vlc_player_t *player = vlc_playlist_GetPlayer( getPL() );
39-
vlc_player_vout_OSDMessage( player,
39+
vlc_player_osd_Message( player,
4040
VOUT_SPU_CHANNEL_OSD, "%s", _( "Quit" ) );
4141

4242
// Kill libvlc

‎src/input/player.c

Lines changed: 25 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ vouts_osd_Slider(vout_thread_t **vouts, size_t count, int position, short type)
311311
}
312312

313313
void
314-
vlc_player_vout_OSDMessage(vlc_player_t *player, const char *fmt, ...)
314+
vlc_player_osd_Message(vlc_player_t *player, const char *fmt, ...)
315315
{
316316
size_t count;
317317
vout_thread_t **vouts = vlc_player_vout_OSDHoldAll(player, &count);
@@ -1130,7 +1130,7 @@ vlc_player_GetProgram(vlc_player_t *player, int id)
11301130
static inline void
11311131
vlc_player_vout_OSDProgram(vlc_player_t *player, const char *name)
11321132
{
1133-
vlc_player_vout_OSDMessage(player, _("Program Service ID: %s"), name);
1133+
vlc_player_osd_Message(player, _("Program Service ID: %s"), name);
11341134
}
11351135

11361136
void
@@ -1440,7 +1440,7 @@ vlc_player_vout_OSDTrack(vlc_player_t *player, vlc_es_id_t *id, bool select)
14401440
const char *cat_name = es_format_category_to_string(cat);
14411441
assert(cat_name);
14421442
const char *track_name = select ? track->name : _("N/A");
1443-
vlc_player_vout_OSDMessage(player, _("%s track: %s"), cat_name, track_name);
1443+
vlc_player_osd_Message(player, _("%s track: %s"), cat_name, track_name);
14441444
}
14451445

14461446
unsigned
@@ -1502,8 +1502,7 @@ vlc_player_SelectEsIdList(vlc_player_t *player,
15021502
/* Display track selection message */
15031503
const char *cat_name = es_format_category_to_string(cat);
15041504
if (track_count == 0)
1505-
vlc_player_vout_OSDMessage(player, _("%s track: %s"), cat_name,
1506-
_("N/A"));
1505+
vlc_player_osd_Message(player, _("%s track: %s"), cat_name, _("N/A"));
15071506
else if (track_count == 1)
15081507
vlc_player_vout_OSDTrack(player, es_id_list[0], true);
15091508
else
@@ -1524,8 +1523,8 @@ vlc_player_SelectEsIdList(vlc_player_t *player,
15241523
}
15251524
if (vlc_memstream_close(&stream) == 0)
15261525
{
1527-
vlc_player_vout_OSDMessage(player, _("%s tracks: %s"), cat_name,
1528-
stream.ptr);
1526+
vlc_player_osd_Message(player, _("%s tracks: %s"), cat_name,
1527+
stream.ptr);
15291528
free(stream.ptr);
15301529
}
15311530
}
@@ -2042,7 +2041,7 @@ vlc_player_SelectNextTitle(vlc_player_t *player)
20422041
if (!input)
20432042
return;
20442043
input_ControlPush(input->thread, INPUT_CONTROL_SET_TITLE_NEXT, NULL);
2045-
vlc_player_vout_OSDMessage(player, _("Next title"));
2044+
vlc_player_osd_Message(player, _("Next title"));
20462045
}
20472046

20482047
void
@@ -2052,7 +2051,7 @@ vlc_player_SelectPrevTitle(vlc_player_t *player)
20522051
if (!input)
20532052
return;
20542053
input_ControlPush(input->thread, INPUT_CONTROL_SET_TITLE_PREV, NULL);
2055-
vlc_player_vout_OSDMessage(player, _("Previous title"));
2054+
vlc_player_osd_Message(player, _("Previous title"));
20562055
}
20572056

20582057
ssize_t
@@ -2073,7 +2072,7 @@ vlc_player_SelectChapterIdx(vlc_player_t *player, size_t index)
20732072
return;
20742073
input_ControlPushHelper(input->thread, INPUT_CONTROL_SET_SEEKPOINT,
20752074
&(vlc_value_t){ .i_int = index });
2076-
vlc_player_vout_OSDMessage(player, _("Chapter %ld"), index);
2075+
vlc_player_osd_Message(player, _("Chapter %ld"), index);
20772076
}
20782077

20792078
void
@@ -2083,7 +2082,7 @@ vlc_player_SelectNextChapter(vlc_player_t *player)
20832082
if (!input)
20842083
return;
20852084
input_ControlPush(input->thread, INPUT_CONTROL_SET_SEEKPOINT_NEXT, NULL);
2086-
vlc_player_vout_OSDMessage(player, _("Next chapter"));
2085+
vlc_player_osd_Message(player, _("Next chapter"));
20872086
}
20882087

20892088
void
@@ -2093,7 +2092,7 @@ vlc_player_SelectPrevChapter(vlc_player_t *player)
20932092
if (!input)
20942093
return;
20952094
input_ControlPush(input->thread, INPUT_CONTROL_SET_SEEKPOINT_PREV, NULL);
2096-
vlc_player_vout_OSDMessage(player, _("Previous chapter"));
2095+
vlc_player_osd_Message(player, _("Previous chapter"));
20972096
}
20982097

20992098
static void
@@ -2446,12 +2445,12 @@ vlc_player_AddAssociatedMedia(vlc_player_t *player,
24462445
switch( type )
24472446
{
24482447
case SLAVE_TYPE_AUDIO:
2449-
vlc_player_vout_OSDMessage(player, "%s",
2450-
vlc_gettext("Audio track added"));
2448+
vlc_player_osd_Message(player, "%s",
2449+
vlc_gettext("Audio track added"));
24512450
break;
24522451
case SLAVE_TYPE_SPU:
2453-
vlc_player_vout_OSDMessage(player, "%s",
2454-
vlc_gettext("Subtitle track added"));
2452+
vlc_player_osd_Message(player, "%s",
2453+
vlc_gettext("Subtitle track added"));
24552454
break;
24562455
}
24572456
}
@@ -2608,7 +2607,7 @@ vlc_player_NextVideoFrame(vlc_player_t *player)
26082607
if (!input)
26092608
return;
26102609
input_ControlPushHelper(input->thread, INPUT_CONTROL_SET_FRAME_NEXT, NULL);
2611-
vlc_player_vout_OSDMessage(player, _("Next frame"));
2610+
vlc_player_osd_Message(player, _("Next frame"));
26122611
}
26132612

26142613
enum vlc_player_state
@@ -2661,7 +2660,7 @@ vlc_player_ChangeRate(vlc_player_t *player, float rate)
26612660
else
26622661
vlc_player_SendEvent(player, on_rate_changed, rate);
26632662

2664-
vlc_player_vout_OSDMessage(player, ("Speed: %.2fx"), rate);
2663+
vlc_player_osd_Message(player, ("Speed: %.2fx"), rate);
26652664
}
26662665

26672666
static void
@@ -3026,8 +3025,8 @@ vlc_player_SetRecordingEnabled(vlc_player_t *player, bool enable)
30263025
input_ControlPushHelper(input->thread, INPUT_CONTROL_SET_RECORD_STATE,
30273026
&(vlc_value_t) { .b_bool = enable });
30283027

3029-
vlc_player_vout_OSDMessage(player, enable ?
3030-
_("Recording") : _("Recording done"));
3028+
vlc_player_osd_Message(player, enable ?
3029+
_("Recording") : _("Recording done"));
30313030
}
30323031

30333032
int
@@ -3053,9 +3052,9 @@ vlc_player_SetCategoryDelay(vlc_player_t *player, enum es_format_category_e cat,
30533052

30543053
const input_control_param_t param = { .cat_delay = { cat, delay } };
30553054
input_ControlPush(input->thread, INPUT_CONTROL_SET_CATEGORY_DELAY, &param);
3056-
vlc_player_vout_OSDMessage(player, _("%s delay: %i ms"),
3057-
es_format_category_to_string(cat),
3058-
(int)MS_FROM_VLC_TICK(delay));
3055+
vlc_player_osd_Message(player, _("%s delay: %i ms"),
3056+
es_format_category_to_string(cat),
3057+
(int)MS_FROM_VLC_TICK(delay));
30593058
vlc_player_SendEvent(player, on_category_delay_changed, cat, delay);
30603059
return VLC_SUCCESS;
30613060
}
@@ -3101,9 +3100,9 @@ vlc_player_SetEsIdDelay(vlc_player_t *player, vlc_es_id_t *es_id,
31013100
const input_control_param_t param = { .es_delay = { es_id, delay } };
31023101
input_ControlPush(input->thread, INPUT_CONTROL_SET_ES_DELAY, &param);
31033102
if (delay != INT64_MAX)
3104-
vlc_player_vout_OSDMessage(player, _("%s delay: %i ms"),
3105-
trackpriv->t.name,
3106-
(int)MS_FROM_VLC_TICK(delay));
3103+
vlc_player_osd_Message(player, _("%s delay: %i ms"),
3104+
trackpriv->t.name,
3105+
(int)MS_FROM_VLC_TICK(delay));
31073106
vlc_player_SendEvent(player, on_track_delay_changed, es_id, delay);
31083107

31093108
return VLC_SUCCESS;

‎src/libvlccore.sym

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -819,6 +819,7 @@ vlc_player_Lock
819819
vlc_player_Navigate
820820
vlc_player_New
821821
vlc_player_NextVideoFrame
822+
vlc_player_osd_Message
822823
vlc_player_Pause
823824
vlc_player_program_Delete
824825
vlc_player_program_Dup
@@ -873,7 +874,6 @@ vlc_player_vout_Hold
873874
vlc_player_vout_HoldAll
874875
vlc_player_vout_IsFullscreen
875876
vlc_player_vout_IsWallpaperModeEnabled
876-
vlc_player_vout_OSDMessage
877877
vlc_player_vout_RemoveListener
878878
vlc_player_vout_SetFullscreen
879879
vlc_player_vout_SetWallpaperModeEnabled

‎src/playlist/control.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -65,9 +65,9 @@ vlc_playlist_PlaybackOrderChanged(vlc_playlist_t *playlist)
6565
state_text = N_("On");
6666
break;
6767
}
68-
vlc_player_vout_OSDMessage(playlist->player,
69-
_("Random: %s"), vlc_gettext(state_text));
70-
/* vlc_player_vout_OSDMessage() does nothing in tests */
68+
vlc_player_osd_Message(playlist->player,
69+
_("Random: %s"), vlc_gettext(state_text));
70+
/* vlc_player_osd_Message() does nothing in tests */
7171
VLC_UNUSED(state_text);
7272
}
7373

@@ -102,9 +102,9 @@ vlc_playlist_PlaybackRepeatChanged(vlc_playlist_t *playlist)
102102
state_text = N_("One");
103103
break;
104104
}
105-
vlc_player_vout_OSDMessage(playlist->player,
106-
_("Loop: %s"), vlc_gettext(state_text));
107-
/* vlc_player_vout_OSDMessage() does nothing in tests */
105+
vlc_player_osd_Message(playlist->player,
106+
_("Loop: %s"), vlc_gettext(state_text));
107+
/* vlc_player_osd_Message() does nothing in tests */
108108
VLC_UNUSED(state_text);
109109
}
110110

@@ -369,7 +369,7 @@ vlc_playlist_Prev(vlc_playlist_t *playlist)
369369
}
370370

371371
vlc_playlist_SetCurrentIndex(playlist, index);
372-
vlc_player_vout_OSDMessage(playlist->player, _("Previous"));
372+
vlc_player_osd_Message(playlist->player, _("Previous"));
373373
return VLC_SUCCESS;
374374
}
375375

@@ -397,7 +397,7 @@ vlc_playlist_Next(vlc_playlist_t *playlist)
397397
}
398398

399399
vlc_playlist_SetCurrentIndex(playlist, index);
400-
vlc_player_vout_OSDMessage(playlist->player, _("Next"));
400+
vlc_player_osd_Message(playlist->player, _("Next"));
401401
return VLC_SUCCESS;
402402
}
403403

‎src/playlist/playlist.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ typedef struct input_item_t input_item_t;
4040
# define vlc_player_RemoveListener(a,b) free(b)
4141
# define vlc_player_SetCurrentMedia(a,b) (VLC_UNUSED(b), VLC_SUCCESS)
4242
# define vlc_player_InvalidateNextMedia(p) VLC_UNUSED(p)
43-
# define vlc_player_vout_OSDMessage(p, fmt...) VLC_UNUSED(p)
43+
# define vlc_player_osd_Message(p, fmt...) VLC_UNUSED(p)
4444
#endif /* TEST_PLAYLIST */
4545

4646
typedef struct VLC_VECTOR(vlc_playlist_item_t *) playlist_item_vector_t;

0 commit comments

Comments
 (0)