mirror of https://github.com/mpv-player/mpv
spelling/grammar/wording fixes in doxygen and non-doxygen comments
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@18317 b3059339-0415-0410-9bf9-f77b7e298cf2
This commit is contained in:
parent
9e6de98c11
commit
a2fdc1955c
14
m_config.h
14
m_config.h
|
@ -4,8 +4,8 @@
|
|||
/// \defgroup Config Config manager
|
||||
///
|
||||
/// m_config provides an API to manipulate the config variables in MPlayer.
|
||||
/// It make uses of the \ref Options API to provide a context stack that
|
||||
/// allow saving and later restoring the state of all variables.
|
||||
/// It makes use of the \ref Options API to provide a context stack that
|
||||
/// allows saving and later restoring the state of all variables.
|
||||
///@{
|
||||
|
||||
/// \file
|
||||
|
@ -23,8 +23,8 @@ struct m_config_save_slot {
|
|||
m_config_save_slot_t* prev;
|
||||
/// Level at which the save was made.
|
||||
int lvl;
|
||||
// we have to store other datatypes in this as well,
|
||||
// so make sure we get properly aligned addresses
|
||||
// We have to store other datatypes in this as well,
|
||||
// so make sure we get properly aligned addresses.
|
||||
unsigned char data[0] __attribute__ ((aligned (8)));
|
||||
};
|
||||
|
||||
|
@ -84,7 +84,7 @@ typedef struct m_config {
|
|||
/// \ingroup Config
|
||||
///@{
|
||||
|
||||
/// Set if an option have been set at the current level.
|
||||
/// Set if an option has been set at the current level.
|
||||
#define M_CFG_OPT_SET (1<<0)
|
||||
|
||||
/// Set if another option already uses the same variable.
|
||||
|
@ -173,7 +173,7 @@ m_profile_t*
|
|||
m_config_add_profile(m_config_t* config, char* name);
|
||||
|
||||
/// Set the description of a profile.
|
||||
/** This is used by the config file parser when defining a profile.
|
||||
/** Used by the config file parser when defining a profile.
|
||||
*
|
||||
* \param p The profile object.
|
||||
* \param arg The profile's name.
|
||||
|
@ -182,7 +182,7 @@ void
|
|||
m_profile_set_desc(m_profile_t* p, char* desc);
|
||||
|
||||
/// Add an option to a profile.
|
||||
/** This is used by the config file parser when defining a profile.
|
||||
/** Used by the config file parser when defining a profile.
|
||||
*
|
||||
* \param config The config object.
|
||||
* \param p The profile object.
|
||||
|
|
48
m_option.h
48
m_option.h
|
@ -36,7 +36,7 @@ extern m_option_type_t m_option_type_subconfig;
|
|||
extern m_option_type_t m_option_type_imgfmt;
|
||||
extern m_option_type_t m_option_type_afmt;
|
||||
|
||||
// Func based types
|
||||
// Func-based types
|
||||
extern m_option_type_t m_option_type_func_full;
|
||||
extern m_option_type_t m_option_type_func_param;
|
||||
extern m_option_type_t m_option_type_func;
|
||||
|
@ -53,7 +53,7 @@ typedef int (*m_opt_func_param_t)(m_option_t *, char *);
|
|||
/// Callback used by m_option_type_func options.
|
||||
typedef int (*m_opt_func_t)(m_option_t *);
|
||||
|
||||
// Backward compat
|
||||
// Backwards compatibility
|
||||
typedef m_opt_default_func_t cfg_default_func_t;
|
||||
typedef m_opt_func_full_t cfg_func_arg_param_t;
|
||||
typedef m_opt_func_param_t cfg_func_param_t;
|
||||
|
@ -80,7 +80,7 @@ typedef struct m_obj_settings {
|
|||
char** attribs;
|
||||
} m_obj_settings_t;
|
||||
|
||||
/// A parser to setup a list of objects.
|
||||
/// A parser to set up a list of objects.
|
||||
/** It creates a NULL terminated array \ref m_obj_settings. The option priv
|
||||
* field (\ref m_option::priv) must point to a \ref m_obj_list_t describing
|
||||
* the available object types.
|
||||
|
@ -93,7 +93,7 @@ typedef struct {
|
|||
struct m_struct_st* in_desc;
|
||||
/// Description of the struct that should be set by the presets.
|
||||
struct m_struct_st* out_desc;
|
||||
/// Pointer to an array of struct defining the various presets.
|
||||
/// Pointer to an array of structs defining the various presets.
|
||||
void* presets;
|
||||
/// Offset of the preset's name inside the in_struct.
|
||||
void* name_off;
|
||||
|
@ -102,7 +102,7 @@ typedef struct {
|
|||
/// Set several fields in a struct at once.
|
||||
/** For this two struct descriptions are used. One for the struct holding the
|
||||
* preset and one for the struct beeing set. Every field present in both
|
||||
* struct will be copied from the preset struct to the destination one.
|
||||
* structs will be copied from the preset struct to the destination one.
|
||||
* The option priv field (\ref m_option::priv) must point to a correctly
|
||||
* filled \ref m_obj_presets_t.
|
||||
*/
|
||||
|
@ -165,7 +165,7 @@ extern m_obj_params_t m_span_params_def;
|
|||
/// Option type description
|
||||
struct m_option_type {
|
||||
char* name;
|
||||
/// Syntax desc, etc
|
||||
/// Syntax description, etc
|
||||
char* comments;
|
||||
/// Size needed for the data.
|
||||
unsigned int size;
|
||||
|
@ -197,19 +197,19 @@ struct m_option_type {
|
|||
/** \name
|
||||
* These functions are called to save/set/restore the status of the
|
||||
* variables. The difference between the 3 only matters for types like
|
||||
* \ref m_option_type_func where 'setting' need to do more than just
|
||||
* \ref m_option_type_func where 'setting' needs to do more than just
|
||||
* copying some data.
|
||||
*/
|
||||
//@{
|
||||
|
||||
/// Update a save slot (dst) from the current value in the prog (src).
|
||||
/// Update a save slot (dst) from the current value in the program (src).
|
||||
/** \param opt The option to copy.
|
||||
* \param dst Pointer to the destination memory.
|
||||
* \param src Pointer to the source memory.
|
||||
*/
|
||||
void (*save)(m_option_t* opt,void* dst, void* src);
|
||||
|
||||
/// Set the value in the prog (dst) from a save slot.
|
||||
/// Set the value in the program (dst) from a save slot.
|
||||
/** \param opt The option to copy.
|
||||
* \param dst Pointer to the destination memory.
|
||||
* \param src Pointer to the source memory.
|
||||
|
@ -262,10 +262,10 @@ struct m_option {
|
|||
/// also be set.
|
||||
double max;
|
||||
|
||||
/// Type dependent data (for all kind of extended settings).
|
||||
/** This used to be function pointer to hold a 'reverse to defaults' func.
|
||||
/// Type dependent data (for all kinds of extended settings).
|
||||
/** This used to be a function pointer to hold a 'reverse to defaults' func.
|
||||
* Now it can be used to pass any type of extra args needed by the parser.
|
||||
* Passing a 'default func' is still valid for all func based option types
|
||||
* Passing a 'default func' is still valid for all func based option types.
|
||||
*/
|
||||
void* priv;
|
||||
};
|
||||
|
@ -291,25 +291,25 @@ struct m_option {
|
|||
|
||||
/// The option is global in the \ref Config.
|
||||
/** It won't be saved on push and the command line parser will set it when
|
||||
* it's parsed (ie. it won't be set later)
|
||||
* it's parsed (i.e. it won't be set later)
|
||||
* e.g options : -v, -quiet
|
||||
*/
|
||||
#define M_OPT_GLOBAL (1<<4)
|
||||
|
||||
/// The \ref Config won't save this option on push.
|
||||
/** It won't be saved on push but the command line parser will add it with
|
||||
* its entry (ie : it may be set later)
|
||||
* its entry (i.e. it may be set later)
|
||||
* e.g options : -include
|
||||
*/
|
||||
#define M_OPT_NOSAVE (1<<5)
|
||||
|
||||
/// \brief The \ref Config will emulate the old behaviour by pushing the
|
||||
/// \brief The \ref Config will emulate the old behavior by pushing the
|
||||
/// option only if it was set by the user.
|
||||
#define M_OPT_OLD (1<<6)
|
||||
|
||||
/// \defgroup OldOptionFlags Backward compatibility
|
||||
///
|
||||
/// Those are kept for compatibility with older code.
|
||||
/// These are kept for compatibility with older code.
|
||||
/// @{
|
||||
#define CONF_MIN M_OPT_MIN
|
||||
#define CONF_MAX M_OPT_MAX
|
||||
|
@ -326,7 +326,7 @@ struct m_option {
|
|||
/// \defgroup OptionTypeFlags Option type flags
|
||||
/// \ingroup OptionTypes
|
||||
///
|
||||
/// These flags are used to describe special parser capabilities or behaviour.
|
||||
/// These flags are used to describe special parser capabilities or behavior.
|
||||
///
|
||||
///@{
|
||||
|
||||
|
@ -341,16 +341,16 @@ struct m_option {
|
|||
#define M_OPT_TYPE_HAS_CHILD (1<<0)
|
||||
|
||||
/// Wildcard matching flag.
|
||||
/** If set the option type has a use for option name ending with a *
|
||||
/** If set the option type has a use for option names ending with a *
|
||||
* (used for -aa*), this only affects the option name matching.
|
||||
*/
|
||||
#define M_OPT_TYPE_ALLOW_WILDCARD (1<<1)
|
||||
|
||||
/// Dynamic data type.
|
||||
/** This flag indicate that the data is dynamically allocated (m_option::p point
|
||||
* to a pointer). It enables a little hack in the \ref Config wich replace
|
||||
* the initial value of such variables with a dynamic copy in case the
|
||||
* initial value is statically allocated (pretty common with strings).
|
||||
/** This flag indicates that the data is dynamically allocated (m_option::p
|
||||
* points to a pointer). It enables a little hack in the \ref Config wich
|
||||
* replaces the initial value of such variables with a dynamic copy in case
|
||||
* the initial value is statically allocated (pretty common with strings).
|
||||
*/
|
||||
#define M_OPT_TYPE_DYNAMIC (1<<2)
|
||||
|
||||
|
@ -360,7 +360,7 @@ struct m_option {
|
|||
* until the set call to be able to correctly set the target var.
|
||||
* So for those types new values must first be parsed, then set to the target
|
||||
* var. If this flag isn't set then new values can be parsed directly to the
|
||||
* target var. It's used by the callback based option as the callback call
|
||||
* target var. It's used by the callback-based options as the callback call
|
||||
* may append later on.
|
||||
*/
|
||||
#define M_OPT_TYPE_INDIRECT (1<<3)
|
||||
|
@ -372,7 +372,7 @@ struct m_option {
|
|||
/// \defgroup OptionParserModes Option parser modes
|
||||
/// \ingroup Options
|
||||
///
|
||||
/// Some parsers behaves differently depending on the mode passed in the src
|
||||
/// Some parsers behave differently depending on the mode passed in the src
|
||||
/// parameter of m_option_type::parse. For example the flag type doesn't take
|
||||
/// an argument when parsing from the command line.
|
||||
///@{
|
||||
|
|
118
mplayer.c
118
mplayer.c
|
@ -395,10 +395,10 @@ static char* rtc_device;
|
|||
|
||||
edl_record_ptr edl_records = NULL; ///< EDL entries memory area
|
||||
edl_record_ptr next_edl_record = NULL; ///< only for traversing edl_records
|
||||
short user_muted = 0; ///< Stores whether User wanted muted mode.
|
||||
short user_muted = 0; ///< Stores whether user wanted muted mode.
|
||||
short edl_muted = 0; ///< Stores whether EDL is currently in muted mode.
|
||||
short edl_decision = 0; ///< 1 when an EDL operation has been made
|
||||
FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode
|
||||
short edl_decision = 0; ///< 1 when an EDL operation has been made.
|
||||
FILE* edl_fd = NULL; ///< fd to write to when in -edlout mode.
|
||||
|
||||
static unsigned int inited_flags=0;
|
||||
#define INITED_VO 1
|
||||
|
@ -464,7 +464,7 @@ static void uninit_player(unsigned int mask){
|
|||
video_out=NULL;
|
||||
}
|
||||
|
||||
// must be after libvo uninit, as few vo drivers (svgalib) has tty code
|
||||
// Must be after libvo uninit, as few vo drivers (svgalib) have tty code.
|
||||
if(mask&INITED_GETCH2){
|
||||
inited_flags&=~INITED_GETCH2;
|
||||
current_module="uninit_getch2";
|
||||
|
@ -517,7 +517,7 @@ static void exit_player_with_rc(char* how, int rc){
|
|||
#ifdef HAVE_NEW_GUI
|
||||
if ( !use_gui )
|
||||
#endif
|
||||
vo_uninit(); // close the X11 connection (if any opened)
|
||||
vo_uninit(); // Close the X11 connection (if any is open).
|
||||
#endif
|
||||
|
||||
#ifdef HAVE_FREETYPE
|
||||
|
@ -704,9 +704,10 @@ void load_per_file_config (m_config_t* conf, const char *const file)
|
|||
}
|
||||
}
|
||||
|
||||
// When libmpdemux perform a blocking operation (network connection or cache filling)
|
||||
// if the operation fail we use this function to check if it was interrupted by the user.
|
||||
// The function return a new value for eof.
|
||||
/* When libmpdemux performs a blocking operation (network connection or
|
||||
* cache filling) if the operation fails we use this function to check
|
||||
* if it was interrupted by the user.
|
||||
* The function returns a new value for eof. */
|
||||
static int libmpdemux_was_interrupted(int eof) {
|
||||
mp_cmd_t* cmd;
|
||||
if((cmd = mp_input_get_cmd(0,0,0)) != NULL) {
|
||||
|
@ -899,11 +900,11 @@ static void print_status(float a_pos, float a_v, float corr)
|
|||
else
|
||||
width = 80;
|
||||
#ifdef WIN32
|
||||
// windows command line is broken (MinGW's rxvt works though, but we
|
||||
// should not depend on that).
|
||||
/* Windows command line is broken (MinGW's rxvt works, but we
|
||||
* should not depend on that). */
|
||||
width--;
|
||||
#endif
|
||||
line = malloc(width + 1); // one additional for terminating null
|
||||
line = malloc(width + 1); // one additional char for the terminating null
|
||||
|
||||
// Audio time
|
||||
if (sh_audio) {
|
||||
|
@ -1061,7 +1062,7 @@ static void log_sub(void){
|
|||
#define OSD_MSG_OSD_STATUS 4
|
||||
#define OSD_MSG_BAR 5
|
||||
#define OSD_MSG_PAUSE 6
|
||||
/// Base id for the messages generated from the commmand to property bridge.
|
||||
/// Base id for messages generated from the commmand to property bridge.
|
||||
#define OSD_MSG_PROPERTY 0x100
|
||||
|
||||
|
||||
|
@ -1156,9 +1157,9 @@ static void clear_osd_msgs(void) {
|
|||
}
|
||||
|
||||
/**
|
||||
* \brief Get the current message fron the OSD stack
|
||||
* \brief Get the current message from the OSD stack.
|
||||
*
|
||||
* This function decrement the message timer and destroy the old ones.
|
||||
* This function decrements the message timer and destroys the old ones.
|
||||
* The message that should be displayed is returned (if any).
|
||||
*
|
||||
*/
|
||||
|
@ -1175,12 +1176,12 @@ static mp_osd_msg_t* get_osd_msg(void) {
|
|||
|
||||
last_update = now;
|
||||
|
||||
// look for the first message in the stack with high enouth level
|
||||
// Look for the first message in the stack with high enough level.
|
||||
for(msg = osd_msg_stack ; msg ; last = msg, msg = prev) {
|
||||
prev = msg->prev;
|
||||
if(msg->level > osd_level && hidden_dec_done) continue;
|
||||
// The message have an high enouth level or it is the first hidden one
|
||||
// in both case we decrement the timer or kill it
|
||||
// The message has a high enough level or it is the first hidden one
|
||||
// in both cases we decrement the timer or kill it.
|
||||
if(!msg->started || msg->time > diff) {
|
||||
if(msg->started) msg->time -= diff;
|
||||
else msg->started = 1;
|
||||
|
@ -1203,7 +1204,7 @@ static mp_osd_msg_t* get_osd_msg(void) {
|
|||
return NULL;
|
||||
}
|
||||
|
||||
// Make a define to test if we are using the term osd without having
|
||||
// Make a define to test if we are using the term OSD without having
|
||||
// to #ifdef USE_OSD all the time.
|
||||
#ifdef USE_OSD
|
||||
#define use_term_osd (term_osd && !sh_video)
|
||||
|
@ -1214,7 +1215,7 @@ static mp_osd_msg_t* get_osd_msg(void) {
|
|||
/**
|
||||
* \brief Display the OSD bar.
|
||||
*
|
||||
* Display the osd bar or fallback on a simple message.
|
||||
* Display the OSD bar or fall back on a simple message.
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -1240,9 +1241,9 @@ void set_osd_bar(int type,char* name,double min,double max,double val) {
|
|||
/**
|
||||
* \brief Update the OSD message line.
|
||||
*
|
||||
* This function display the current message on the vo osd or on the term.
|
||||
* If the stack is empty and the osd level is high enouth the timer
|
||||
* is displayed (only on the vo osd).
|
||||
* This function displays the current message on the vo OSD or on the term.
|
||||
* If the stack is empty and the OSD level is high enough the timer
|
||||
* is displayed (only on the vo OSD).
|
||||
*
|
||||
*/
|
||||
|
||||
|
@ -1699,7 +1700,7 @@ static int mp_property_framedropping(m_option_t* prop,int action,void* arg) {
|
|||
}
|
||||
}
|
||||
|
||||
/// Color settings, try to use vf/vo then fallback on TV. (RW)
|
||||
/// Color settings, try to use vf/vo then fall back on TV. (RW)
|
||||
static int mp_property_gamma(m_option_t* prop,int action,void* arg) {
|
||||
int* gamma = prop->priv, r;
|
||||
|
||||
|
@ -1794,7 +1795,7 @@ static int mp_property_aspect(m_option_t* prop,int action,void* arg) {
|
|||
/// \ingroup Properties
|
||||
///@{
|
||||
|
||||
/// Text subtitles position (RW)
|
||||
/// Text subtitle position (RW)
|
||||
static int mp_property_sub_pos(m_option_t* prop,int action,void* arg) {
|
||||
#ifdef USE_SUB
|
||||
if(!sh_video) return M_PROPERTY_UNAVAILABLE;
|
||||
|
@ -1813,7 +1814,7 @@ static int mp_property_sub_pos(m_option_t* prop,int action,void* arg) {
|
|||
#endif
|
||||
}
|
||||
|
||||
/// Selected subs (RW)
|
||||
/// Selected subtitles (RW)
|
||||
static int mp_property_sub(m_option_t* prop,int action,void* arg) {
|
||||
int source = -1, reset_spu = 0;
|
||||
|
||||
|
@ -1989,7 +1990,7 @@ static int mp_property_sub(m_option_t* prop,int action,void* arg) {
|
|||
return 1;
|
||||
}
|
||||
|
||||
/// Subtitles delay (RW)
|
||||
/// Subtitle delay (RW)
|
||||
static int mp_property_sub_delay(m_option_t* prop,int action,void* arg) {
|
||||
if(!sh_video) return M_PROPERTY_UNAVAILABLE;
|
||||
return m_property_delay(prop,action,arg,&sub_delay);
|
||||
|
@ -2022,7 +2023,7 @@ static int mp_property_sub_alignment(m_option_t* prop,int action,void* arg) {
|
|||
#endif
|
||||
}
|
||||
|
||||
/// Subtitles visibility (RW)
|
||||
/// Subtitle visibility (RW)
|
||||
static int mp_property_sub_visibility(m_option_t* prop,int action,void* arg) {
|
||||
#ifdef USE_SUB
|
||||
if(!sh_video) return M_PROPERTY_UNAVAILABLE;
|
||||
|
@ -2225,16 +2226,16 @@ int mp_property_do(char* name,int action, void* val) {
|
|||
* \defgroup Command2Property Command to property bridge
|
||||
*
|
||||
* It is used to handle most commands that just set a property
|
||||
* and optionaly display something on the OSD.
|
||||
* and optionally display something on the OSD.
|
||||
* Two kinds of commands are handled: adjust or toggle.
|
||||
*
|
||||
* Adjust commands take 1 or 2 paramter: <value> <abs>
|
||||
* If <abs> is none zero the property is set to the given value
|
||||
* Adjust commands take 1 or 2 parameters: <value> <abs>
|
||||
* If <abs> is non-zero the property is set to the given value
|
||||
* otherwise it is adjusted.
|
||||
*
|
||||
* Toggle commands take 0 or 1 parameter. With no parameter
|
||||
* or a value less than the property minimum it just step the
|
||||
* property to it's next value. Otherwise it set it to the given
|
||||
* Toggle commands take 0 or 1 parameters. With no parameter
|
||||
* or a value less than the property minimum it just steps the
|
||||
* property to its next value. Otherwise it sets it to the given
|
||||
* value.
|
||||
*
|
||||
*@{
|
||||
|
@ -2248,7 +2249,7 @@ static struct {
|
|||
int cmd;
|
||||
/// set/adjust or toggle command
|
||||
int toggle;
|
||||
/// progbar type
|
||||
/// progressbar type
|
||||
int osd_progbar;
|
||||
/// osd msg id if it must be shared
|
||||
int osd_id;
|
||||
|
@ -2362,7 +2363,8 @@ int delay_corrected=1;
|
|||
int rtc_fd=-1;
|
||||
#endif
|
||||
|
||||
int opt_exit = 0; // flag indicating whether mplayer should exit without playing anything
|
||||
/* Flag indicating whether MPlayer should exit without playing anything. */
|
||||
int opt_exit = 0;
|
||||
|
||||
//float a_frame=0; // Audio
|
||||
|
||||
|
@ -2379,7 +2381,7 @@ int gui_no_filename=0;
|
|||
mp_msg_init();
|
||||
|
||||
mp_msg(MSGT_CPLAYER,MSGL_INFO, "MPlayer " VERSION " (C) 2000-2006 MPlayer Team\n");
|
||||
/* Test for cpu capabilities (and corresponding OS support) for optimizing */
|
||||
/* Test for CPU capabilities (and corresponding OS support) for optimizing */
|
||||
GetCpuCaps(&gCpuCaps);
|
||||
#if defined(ARCH_X86) || defined(ARCH_X86_64)
|
||||
mp_msg(MSGT_CPLAYER,MSGL_INFO,"CPUflags: MMX: %d MMX2: %d 3DNow: %d 3DNow2: %d SSE: %d SSE2: %d\n",
|
||||
|
@ -2476,7 +2478,7 @@ int gui_no_filename=0;
|
|||
}
|
||||
if (use_gui && playtree_iter){
|
||||
char cwd[PATH_MAX+2];
|
||||
// Remove Playtree and Playtree-Iter from memory as its not used by gui
|
||||
// Free Playtree and Playtree-Iter as it's not used by the GUI.
|
||||
play_tree_iter_free(playtree_iter);
|
||||
playtree_iter=NULL;
|
||||
|
||||
|
@ -2486,7 +2488,7 @@ int gui_no_filename=0;
|
|||
// Prefix relative paths with current working directory
|
||||
play_tree_add_bpf(playtree, cwd);
|
||||
}
|
||||
// Import initital playtree into gui
|
||||
// Import initital playtree into GUI.
|
||||
import_initial_playtree_into_gui(playtree, mconfig, enqueue);
|
||||
}
|
||||
#endif /* HAVE_NEW_GUI */
|
||||
|
@ -2501,7 +2503,7 @@ int gui_no_filename=0;
|
|||
opt_exit = 1;
|
||||
}
|
||||
|
||||
// check codec.conf
|
||||
/* Check codecs.conf. */
|
||||
if(!codecs_file || !parse_codec_cfg(codecs_file)){
|
||||
if(!parse_codec_cfg(mem_ptr=get_path("codecs.conf"))){
|
||||
if(!parse_codec_cfg(MPLAYER_CONFDIR "/codecs.conf")){
|
||||
|
@ -2817,7 +2819,7 @@ while (player_idle_mode && !filename) {
|
|||
// prepare a tree entry with the new filename
|
||||
entry = play_tree_new();
|
||||
play_tree_add_file(entry, cmd->args[0].v.s);
|
||||
// actual entering the entry into the main playtree done after switch()
|
||||
// The entry is added to the main playtree after the switch().
|
||||
break;
|
||||
case MP_CMD_LOADLIST:
|
||||
entry = parse_playlist_file(cmd->args[0].v.s);
|
||||
|
@ -2838,7 +2840,8 @@ while (player_idle_mode && !filename) {
|
|||
|
||||
play_tree_set_child(playtree, entry);
|
||||
|
||||
playtree_iter = play_tree_iter_new(playtree, mconfig); // make iterator starting at top of tree
|
||||
/* Make iterator start at the top the of tree. */
|
||||
playtree_iter = play_tree_iter_new(playtree, mconfig);
|
||||
if (!playtree_iter) continue;
|
||||
|
||||
// find the first real item in the tree
|
||||
|
@ -3276,7 +3279,7 @@ if (vo_spudec!=NULL)
|
|||
#ifdef USE_SUB
|
||||
if(sh_video) {
|
||||
// after reading video params we should load subtitles because
|
||||
// we know fps so now we can adjust subtitles time to ~6 seconds AST
|
||||
// we know fps so now we can adjust subtitle time to ~6 seconds AST
|
||||
// check .sub
|
||||
current_module="read_subtitles_file";
|
||||
if(sub_name){
|
||||
|
@ -3338,7 +3341,7 @@ if (global_sub_size) {
|
|||
|
||||
//================== Init AUDIO (codec) ==========================
|
||||
if(sh_audio){
|
||||
// Go through the codec.conf and find the best codec...
|
||||
/* Go through codecs.conf and find the best codec... */
|
||||
current_module="init_audio_codec";
|
||||
mp_msg(MSGT_CPLAYER,MSGL_INFO,"==========================================================================\n");
|
||||
if(!init_best_audio_codec(sh_audio,audio_codec_list,audio_fm_list)){
|
||||
|
@ -3461,7 +3464,7 @@ current_module="main";
|
|||
}
|
||||
|
||||
|
||||
// Disable the term osd in verbose mode
|
||||
// Disable the term OSD in verbose mode
|
||||
if(verbose) term_osd = 0;
|
||||
fflush(stdout);
|
||||
|
||||
|
@ -3497,7 +3500,7 @@ int frame_time_remaining=0; // flag
|
|||
int blit_frame=0;
|
||||
int was_paused=0;
|
||||
|
||||
// make sure OSD old does not stay around,
|
||||
// Make sure old OSD does not stay around,
|
||||
// e.g. with -fixed-vo and same-resolution files
|
||||
clear_osd_msgs();
|
||||
update_osd_msg();
|
||||
|
@ -3705,14 +3708,14 @@ if(!sh_video) {
|
|||
sh_video->timer+=frame_time;
|
||||
if(sh_audio) sh_audio->delay-=frame_time;
|
||||
time_frame+=frame_time; // for nosound
|
||||
// video_read_frame can change fps (e.g. for asf video)
|
||||
// video_read_frame can change fps (e.g. for ASF video)
|
||||
vo_fps = sh_video->fps;
|
||||
// check for frame-drop:
|
||||
current_module="check_framedrop";
|
||||
if(sh_audio && !d_audio->eof){
|
||||
float delay=playback_speed*audio_out->get_delay();
|
||||
float d=delay-sh_audio->delay;
|
||||
// we should avoid dropping to many frames in sequence unless we
|
||||
// we should avoid dropping too many frames in sequence unless we
|
||||
// are too late. and we allow 100ms A-V delay here:
|
||||
if(d<-dropped_frames*frame_time-0.100 && osd_function != OSD_PAUSE){
|
||||
drop_frame=frame_dropping;
|
||||
|
@ -3909,8 +3912,8 @@ if(time_frame>0.001 && !(vo_flags&256)){
|
|||
vout_time_usage+=tt;
|
||||
} else {
|
||||
/*
|
||||
Well, no blitting is needed, but some devices (such as yuv4mpeg) must output frame
|
||||
otherwise A/V desync will occur. -- Alvieboy
|
||||
Well, no blitting is needed, but some devices (such as yuv4mpeg)
|
||||
must output frames otherwise A/V desync will occur. -- Alvieboy
|
||||
*/
|
||||
if (vo_config_count)
|
||||
video_out->control(VOCTRL_DUPLICATE_FRAME, NULL);
|
||||
|
@ -4037,7 +4040,7 @@ if(auto_quality>0){
|
|||
if(osd_function==OSD_PAUSE){
|
||||
mp_cmd_t* cmd;
|
||||
if(!quiet) {
|
||||
// small hack to display the pause message in the osd line
|
||||
// Small hack to display the pause message on the OSD line.
|
||||
// The pause string is: "\n == PAUSE == \r" so we need to
|
||||
// take the first and the last char out
|
||||
if(use_term_osd) {
|
||||
|
@ -4180,7 +4183,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
|
|||
void* val;
|
||||
prop = mp_property_find(cmd->args[0].v.s);
|
||||
if(!prop) mp_msg(MSGT_CPLAYER,MSGL_WARN,"Unkown property: '%s'\n",cmd->args[0].v.s);
|
||||
// use m_option_print directly to get easily parsable values
|
||||
/* Use m_option_print directly to get easily parseable values. */
|
||||
val = calloc(1,prop->type->size);
|
||||
if(m_property_do(prop,M_PROPERTY_GET,val) <= 0) {
|
||||
mp_msg(MSGT_CPLAYER,MSGL_WARN,"Failed to get value of property '%s'.\n",
|
||||
|
@ -4314,7 +4317,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
|
|||
else
|
||||
osd_level= v > max ? max : v;
|
||||
/* Show OSD state when disabled, but not when an explicit
|
||||
argument is given to the osd command, i.e. in slave mode. */
|
||||
argument is given to the OSD command, i.e. in slave mode. */
|
||||
if (v == -1 && osd_level <= 1)
|
||||
set_osd_msg(OSD_MSG_OSD_STATUS,0,osd_duration,
|
||||
MSGTR_OSDosd, osd_level ? MSGTR_OSDenabled : MSGTR_OSDdisabled);
|
||||
|
@ -4328,7 +4331,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
|
|||
} break;
|
||||
case MP_CMD_OSD_SHOW_PROPERTY_TEXT : {
|
||||
char* txt = m_properties_expand_string(mp_properties,cmd->args[0].v.s);
|
||||
/* if no argument supplied take default osd_duration, otherwise <arg> ms. */
|
||||
/* if no argument supplied take default osd_duration, else <arg> ms. */
|
||||
if(txt) {
|
||||
set_osd_msg(OSD_MSG_TEXT,cmd->args[2].v.i,
|
||||
(cmd->args[1].v.i < 0 ? osd_duration : cmd->args[1].v.i),
|
||||
|
@ -4343,7 +4346,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
|
|||
if (cmd->args[1].v.i) // append
|
||||
play_tree_append_entry(playtree, e);
|
||||
else {
|
||||
// Go back to the start point
|
||||
// Go back to the starting point.
|
||||
while(play_tree_iter_up_step(playtree_iter,0,1) != PLAY_TREE_ITER_END)
|
||||
/* NOP */;
|
||||
play_tree_free_list(playtree->child,1);
|
||||
|
@ -4361,7 +4364,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
|
|||
if (cmd->args[1].v.i) // append
|
||||
play_tree_append_entry(playtree, e);
|
||||
else {
|
||||
// Go back to the start point
|
||||
// Go back to the starting point.
|
||||
while(play_tree_iter_up_step(playtree_iter,0,1) != PLAY_TREE_ITER_END)
|
||||
/* NOP */;
|
||||
play_tree_free_list(playtree->child,1);
|
||||
|
@ -4705,7 +4708,7 @@ if (stream->type==STREAMTYPE_DVDNAV && dvd_nav_still)
|
|||
if (d_audio && audio_id!=aid_temp) {
|
||||
mp_msg(MSGT_INPUT,MSGL_DBG2,"d_audio->id change: was %d is now %d\n",
|
||||
d_audio->id,aid_temp);
|
||||
// FIXME: need a bettery way to change audio stream id
|
||||
// FIXME: need a better way to change audio stream id
|
||||
d_audio->id=dvdsub_id=aid_temp;
|
||||
if(sh_audio) resync_audio_stream(sh_audio);
|
||||
}
|
||||
|
@ -4980,7 +4983,8 @@ if(vo_config_count && vo_spudec) {
|
|||
int len,timestamp;
|
||||
current_module="spudec";
|
||||
spudec_heartbeat(vo_spudec,90000*sh_video->timer);
|
||||
// Get a sub packet from the dvd or a vobsub and make a timestamp relative to sh_video->timer
|
||||
/* Get a sub packet from the DVD or a vobsub and make a timestamp
|
||||
relative to sh_video->timer */
|
||||
while(1) {
|
||||
// Vobsub
|
||||
len = 0;
|
||||
|
|
|
@ -247,7 +247,7 @@ parse_playlist_file(char* file);
|
|||
/// by Fabian Franz (mplayer@fabian-franz.de).
|
||||
///@{
|
||||
|
||||
/// Cleanups pt and creates a new iter.
|
||||
// Cleans up pt and creates a new iter.
|
||||
play_tree_iter_t* pt_iter_create(play_tree_t** pt, struct m_config* config);
|
||||
|
||||
/// Frees the iter.
|
||||
|
|
|
@ -2,8 +2,8 @@
|
|||
/// \defgroup PlaytreeParser Playtree parser
|
||||
/// \ingroup Playtree
|
||||
///
|
||||
/// The playtree parser allow to read various playlist formats. It read from
|
||||
/// stream allowing to handle playlist from local files and the network.
|
||||
/// The playtree parser allows to read various playlist formats. It reads from
|
||||
/// a stream allowing to handle playlists from local files and the network.
|
||||
///@{
|
||||
|
||||
/// \file
|
||||
|
@ -22,7 +22,7 @@ typedef struct play_tree_parser {
|
|||
|
||||
/// Create a new parser.
|
||||
/** \param stream The stream to read from.
|
||||
* \param deep Parser depth. Some format allow including other files,
|
||||
* \param deep Parser depth. Some formats allow including other files,
|
||||
* this is used to track the inclusion depth.
|
||||
* \return The new parser.
|
||||
*/
|
||||
|
|
Loading…
Reference in New Issue