mirror of
https://github.com/mpv-player/mpv
synced 2024-12-22 06:42:03 +00:00
423a75250f
The code to format the playback time was duplicated a few times. There
were also minor differences in how the time is formatted. Remove most
of these differences. This also fixes a bug in the output of the
osd_show_progression command, introduced in 74e7a1e937.
There was some logic to display the percent position in the OSD status
for a short while after seeking. Remove that logic and always display
the percent position.
Make --osd-fractions a flag option. This removes the ability to show
the number of frames played since the start of the current second
(i.e. the fraction of the time was turned into a frame number). This
features wasn't so great anyway, because modern video file formats
don't always have a (valid) FPS set, and could lead to inaccurate
display.
Still to sort out:
Unfortunately, the terminal status is still formatted differently from
the OSD, and even worse, it has a completely different time source.
Not sure if I like how the status line looks now (it's a bit "full"?).
Maybe it will be changed again later.
46 lines
1.7 KiB
C
46 lines
1.7 KiB
C
/*
|
|
* This file is part of MPlayer.
|
|
*
|
|
* MPlayer is free software; you can redistribute it and/or modify
|
|
* it under the terms of the GNU General Public License as published by
|
|
* the Free Software Foundation; either version 2 of the License, or
|
|
* (at your option) any later version.
|
|
*
|
|
* MPlayer is distributed in the hope that it will be useful,
|
|
* but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
|
|
* GNU General Public License for more details.
|
|
*
|
|
* You should have received a copy of the GNU General Public License along
|
|
* with MPlayer; if not, write to the Free Software Foundation, Inc.,
|
|
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
|
|
*/
|
|
|
|
#ifndef MPLAYER_MP_OSD_H
|
|
#define MPLAYER_MP_OSD_H
|
|
|
|
#define OSD_MSG_TV_CHANNEL 0
|
|
#define OSD_MSG_TEXT 1
|
|
#define OSD_MSG_SUB_DELAY 2
|
|
#define OSD_MSG_SPEED 3
|
|
#define OSD_MSG_OSD_STATUS 4
|
|
#define OSD_MSG_BAR 5
|
|
#define OSD_MSG_PAUSE 6
|
|
#define OSD_MSG_RADIO_CHANNEL 7
|
|
/// Base id for messages generated from the commmand to property bridge.
|
|
#define OSD_MSG_PROPERTY 0x100
|
|
#define OSD_MSG_SUB_BASE 0x1000
|
|
|
|
#define MAX_OSD_LEVEL 3
|
|
#define MAX_TERM_OSD_LEVEL 1
|
|
|
|
struct MPContext;
|
|
|
|
void set_osd_bar(struct MPContext *mpctx, int type,const char* name,double min,double max,double val);
|
|
void set_osd_msg(int id, int level, int time, const char* fmt, ...);
|
|
void set_osd_tmsg(int id, int level, int time, const char* fmt, ...);
|
|
void rm_osd_msg(int id);
|
|
void mp_show_osd_progression(struct MPContext *mpctx);
|
|
|
|
#endif /* MPLAYER_MP_OSD_H */
|