diff options
author | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 22:02:47 +0300 |
---|---|---|
committer | Uoti Urpala <uau@glyph.nonexistent.invalid> | 2010-05-07 22:03:48 +0300 |
commit | 4c6e3ac01bb158ddaa5603dc93fc7efb91b367b1 (patch) | |
tree | 16662a6828f11f852ee4e0437ad03309d994caef /command.c | |
parent | eee666c3b57870b7610acc846858814ce8498385 (diff) | |
parent | a535f7bfca1bec440cec45f4201494755ed2440b (diff) | |
download | mpv-4c6e3ac01bb158ddaa5603dc93fc7efb91b367b1.tar.bz2 mpv-4c6e3ac01bb158ddaa5603dc93fc7efb91b367b1.tar.xz |
Merge svn change r31134
Fix some search/replace errors introduced in the svn commit.
Diffstat (limited to 'command.c')
-rw-r--r-- | command.c | 2632 |
1 files changed, 1316 insertions, 1316 deletions
@@ -78,29 +78,29 @@ static void rescale_input_coordinates(struct MPContext *mpctx, int ix, int iy, struct MPOpts *opts = &mpctx->opts; struct vo *vo = mpctx->video_out; //remove the borders, if any, and rescale to the range [0,1],[0,1] - if (vo_fs) { //we are in full-screen mode - if (opts->vo_screenwidth > vo->dwidth) //there are borders along the x axis - ix -= (opts->vo_screenwidth - vo->dwidth) / 2; - if (opts->vo_screenheight > vo->dheight) //there are borders along the y axis (usual way) - iy -= (opts->vo_screenheight - vo->dheight) / 2; - - if (ix < 0 || ix > vo->dwidth) { - *dx = *dy = -1.0; - return; - } //we are on one of the borders - if (iy < 0 || iy > vo->dheight) { - *dx = *dy = -1.0; - return; - } //we are on one of the borders + if (vo_fs) { //we are in full-screen mode + if (opts->vo_screenwidth > vo->dwidth) //there are borders along the x axis + ix -= (opts->vo_screenwidth - vo->dwidth) / 2; + if (opts->vo_screenheight > vo->dheight) //there are borders along the y axis (usual way) + iy -= (opts->vo_screenheight - vo->dheight) / 2; + + if (ix < 0 || ix > vo->dwidth) { + *dx = *dy = -1.0; + return; + } //we are on one of the borders + if (iy < 0 || iy > vo->dheight) { + *dx = *dy = -1.0; + return; + } //we are on one of the borders } *dx = (double) ix / (double) vo->dwidth; *dy = (double) iy / (double) vo->dheight; mp_msg(MSGT_CPLAYER, MSGL_V, - "\r\nrescaled coordinates: %.3f, %.3f, screen (%d x %d), vodisplay: (%d, %d), fullscreen: %d\r\n", - *dx, *dy, opts->vo_screenwidth, opts->vo_screenheight, vo->dwidth, - vo->dheight, vo_fs); + "\r\nrescaled coordinates: %.3f, %.3f, screen (%d x %d), vodisplay: (%d, %d), fullscreen: %d\r\n", + *dx, *dy, opts->vo_screenwidth, opts->vo_screenheight, vo->dwidth, + vo->dheight, vo_fs); } static int sub_source_by_pos(MPContext *mpctx, int pos) @@ -109,11 +109,11 @@ static int sub_source_by_pos(MPContext *mpctx, int pos) int top = -1; int i; for (i = 0; i < SUB_SOURCES; i++) { - int j = mpctx->global_sub_indices[i]; - if ((j >= 0) && (j > top) && (pos >= j)) { - source = i; - top = j; - } + int j = mpctx->global_sub_indices[i]; + if ((j >= 0) && (j > top) && (pos >= j)) { + source = i; + top = j; + } } return source; } @@ -140,26 +140,26 @@ static void log_sub(struct MPContext *mpctx) int i; if (subdata == NULL || vo_sub_last == NULL) - return; + return; fname = get_path("subtitle_log"); f = fopen(fname, "a"); if (!f) - return; + return; fprintf(f, "----------------------------------------------------------\n"); if (subdata->sub_uses_time) { - fprintf(f, - "N: %s S: %02ld:%02ld:%02ld.%02ld E: %02ld:%02ld:%02ld.%02ld\n", + fprintf(f, + "N: %s S: %02ld:%02ld:%02ld.%02ld E: %02ld:%02ld:%02ld.%02ld\n", mpctx->filename, vo_sub_last->start / 360000, - (vo_sub_last->start / 6000) % 60, - (vo_sub_last->start / 100) % 60, vo_sub_last->start % 100, - vo_sub_last->end / 360000, (vo_sub_last->end / 6000) % 60, - (vo_sub_last->end / 100) % 60, vo_sub_last->end % 100); + (vo_sub_last->start / 6000) % 60, + (vo_sub_last->start / 100) % 60, vo_sub_last->start % 100, + vo_sub_last->end / 360000, (vo_sub_last->end / 6000) % 60, + (vo_sub_last->end / 100) % 60, vo_sub_last->end % 100); } else { fprintf(f, "N: %s S: %ld E: %ld\n", mpctx->filename, vo_sub_last->start, vo_sub_last->end); } for (i = 0; i < vo_sub_last->lines; i++) { - fprintf(f, "%s\n", vo_sub_last->text[i]); + fprintf(f, "%s\n", vo_sub_last->text[i]); } fclose(f); } @@ -174,7 +174,7 @@ static void log_sub(struct MPContext *mpctx) /// OSD level (RW) static int mp_property_osdlevel(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { return m_property_choice(prop, action, arg, &mpctx->opts.osd_level); } @@ -200,45 +200,45 @@ static int mp_property_loop(m_option_t *prop, int action, void *arg, /// Playback speed (RW) static int mp_property_playback_speed(m_option_t *prop, int action, - void *arg, MPContext *mpctx) + void *arg, MPContext *mpctx) { struct MPOpts *opts = &mpctx->opts; switch (action) { case M_PROPERTY_SET: - if (!arg) - return M_PROPERTY_ERROR; - M_PROPERTY_CLAMP(prop, *(float *) arg); - opts->playback_speed = *(float *) arg; - build_afilter_chain(mpctx, mpctx->sh_audio, &ao_data); - return M_PROPERTY_OK; + if (!arg) + return M_PROPERTY_ERROR; + M_PROPERTY_CLAMP(prop, *(float *) arg); + opts->playback_speed = *(float *) arg; + build_afilter_chain(mpctx, mpctx->sh_audio, &ao_data); + return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: - opts->playback_speed += (arg ? *(float *) arg : 0.1) * - (action == M_PROPERTY_STEP_DOWN ? -1 : 1); - M_PROPERTY_CLAMP(prop, opts->playback_speed); - build_afilter_chain(mpctx, mpctx->sh_audio, &ao_data); - return M_PROPERTY_OK; + opts->playback_speed += (arg ? *(float *) arg : 0.1) * + (action == M_PROPERTY_STEP_DOWN ? -1 : 1); + M_PROPERTY_CLAMP(prop, opts->playback_speed); + build_afilter_chain(mpctx, mpctx->sh_audio, &ao_data); + return M_PROPERTY_OK; } return m_property_float_range(prop, action, arg, &opts->playback_speed); } /// filename with path (RO) static int mp_property_path(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { return m_property_string_ro(prop, action, arg, mpctx->filename); } /// filename without path (RO) static int mp_property_filename(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { char *f; if (!mpctx->filename) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; if (((f = strrchr(mpctx->filename, '/')) || (f = strrchr(mpctx->filename, '\\'))) && f[1]) - f++; + f++; else f = mpctx->filename; return m_property_string_ro(prop, action, arg, f); @@ -246,86 +246,86 @@ static int mp_property_filename(m_option_t *prop, int action, void *arg, /// Demuxer name (RO) static int mp_property_demuxer(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { if (!mpctx->demuxer) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; return m_property_string_ro(prop, action, arg, - (char *) mpctx->demuxer->desc->name); + (char *) mpctx->demuxer->desc->name); } /// Position in the stream (RW) static int mp_property_stream_pos(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { if (!mpctx->demuxer || !mpctx->demuxer->stream) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; if (!arg) - return M_PROPERTY_ERROR; + return M_PROPERTY_ERROR; switch (action) { case M_PROPERTY_GET: - *(off_t *) arg = stream_tell(mpctx->demuxer->stream); - return M_PROPERTY_OK; + *(off_t *) arg = stream_tell(mpctx->demuxer->stream); + return M_PROPERTY_OK; case M_PROPERTY_SET: - M_PROPERTY_CLAMP(prop, *(off_t *) arg); - stream_seek(mpctx->demuxer->stream, *(off_t *) arg); - return M_PROPERTY_OK; + M_PROPERTY_CLAMP(prop, *(off_t *) arg); + stream_seek(mpctx->demuxer->stream, *(off_t *) arg); + return M_PROPERTY_OK; } return M_PROPERTY_NOT_IMPLEMENTED; } /// Stream start offset (RO) static int mp_property_stream_start(m_option_t *prop, int action, - void *arg, MPContext *mpctx) + void *arg, MPContext *mpctx) { if (!mpctx->demuxer || !mpctx->demuxer->stream) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_GET: - *(off_t *) arg = mpctx->demuxer->stream->start_pos; - return M_PROPERTY_OK; + *(off_t *) arg = mpctx->demuxer->stream->start_pos; + return M_PROPERTY_OK; } return M_PROPERTY_NOT_IMPLEMENTED; } /// Stream end offset (RO) static int mp_property_stream_end(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { if (!mpctx->demuxer || !mpctx->demuxer->stream) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_GET: - *(off_t *) arg = mpctx->demuxer->stream->end_pos; - return M_PROPERTY_OK; + *(off_t *) arg = mpctx->demuxer->stream->end_pos; + return M_PROPERTY_OK; } return M_PROPERTY_NOT_IMPLEMENTED; } /// Stream length (RO) static int mp_property_stream_length(m_option_t *prop, int action, - void *arg, MPContext *mpctx) + void *arg, MPContext *mpctx) { if (!mpctx->demuxer || !mpctx->demuxer->stream) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_GET: - *(off_t *) arg = - mpctx->demuxer->stream->end_pos - mpctx->demuxer->stream->start_pos; - return M_PROPERTY_OK; + *(off_t *) arg = + mpctx->demuxer->stream->end_pos - mpctx->demuxer->stream->start_pos; + return M_PROPERTY_OK; } return M_PROPERTY_NOT_IMPLEMENTED; } /// Media length in seconds (RO) static int mp_property_length(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { double len; if (!mpctx->demuxer || - !(int) (len = demuxer_get_time_length(mpctx->demuxer))) - return M_PROPERTY_UNAVAILABLE; + !(int) (len = demuxer_get_time_length(mpctx->demuxer))) + return M_PROPERTY_UNAVAILABLE; return m_property_time_ro(prop, action, arg, len); } @@ -336,7 +336,7 @@ static int mp_property_percent_pos(m_option_t *prop, int action, int pos; if (!mpctx->demuxer) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch(action) { case M_PROPERTY_SET: @@ -549,7 +549,7 @@ static int mp_property_metadata(m_option_t *prop, int action, void *arg, static const m_option_t key_type = { "metadata", NULL, CONF_TYPE_STRING, 0, 0, 0, NULL }; if (!mpctx->demuxer) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch(action) { case M_PROPERTY_GET: @@ -582,10 +582,10 @@ static int mp_property_pause(m_option_t *prop, int action, void *arg, switch (action) { case M_PROPERTY_SET: - if (!arg) - return M_PROPERTY_ERROR; - if (mpctx->paused == (bool)*(int *) arg) - return M_PROPERTY_OK; + if (!arg) + return M_PROPERTY_ERROR; + if (mpctx->paused == (bool)*(int *) arg) + return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: if (mpctx->paused) { @@ -596,9 +596,9 @@ static int mp_property_pause(m_option_t *prop, int action, void *arg, pause_player(mpctx); mpctx->osd_function = OSD_PAUSE; } - return M_PROPERTY_OK; + return M_PROPERTY_OK; default: - return m_property_flag(prop, action, arg, &mpctx->paused); + return m_property_flag(prop, action, arg, &mpctx->paused); } } @@ -611,128 +611,128 @@ static int mp_property_pause(m_option_t *prop, int action, void *arg, /// Volume (RW) static int mp_property_volume(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { if (!mpctx->sh_audio) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_GET: - if (!arg) - return M_PROPERTY_ERROR; - mixer_getbothvolume(&mpctx->mixer, arg); - return M_PROPERTY_OK; + if (!arg) + return M_PROPERTY_ERROR; + mixer_getbothvolume(&mpctx->mixer, arg); + return M_PROPERTY_OK; case M_PROPERTY_PRINT:{ - float vol; - if (!arg) - return M_PROPERTY_ERROR; - mixer_getbothvolume(&mpctx->mixer, &vol); - return m_property_float_range(prop, action, arg, &vol); - } + float vol; + if (!arg) + return M_PROPERTY_ERROR; + mixer_getbothvolume(&mpctx->mixer, &vol); + return m_property_float_range(prop, action, arg, &vol); + } case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: case M_PROPERTY_SET: - break; + break; default: - return M_PROPERTY_NOT_IMPLEMENTED; + return M_PROPERTY_NOT_IMPLEMENTED; } if (mpctx->edl_muted) - return M_PROPERTY_DISABLED; + return M_PROPERTY_DISABLED; mpctx->user_muted = 0; switch (action) { case M_PROPERTY_SET: - if (!arg) - return M_PROPERTY_ERROR; - M_PROPERTY_CLAMP(prop, *(float *) arg); - mixer_setvolume(&mpctx->mixer, *(float *) arg, *(float *) arg); - return M_PROPERTY_OK; + if (!arg) + return M_PROPERTY_ERROR; + M_PROPERTY_CLAMP(prop, *(float *) arg); + mixer_setvolume(&mpctx->mixer, *(float *) arg, *(float *) arg); + return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: - if (arg && *(float *) arg <= 0) - mixer_decvolume(&mpctx->mixer); - else - mixer_incvolume(&mpctx->mixer); - return M_PROPERTY_OK; + if (arg && *(float *) arg <= 0) + mixer_decvolume(&mpctx->mixer); + else + mixer_incvolume(&mpctx->mixer); + return M_PROPERTY_OK; case M_PROPERTY_STEP_DOWN: - if (arg && *(float *) arg <= 0) - mixer_incvolume(&mpctx->mixer); - else - mixer_decvolume(&mpctx->mixer); - return M_PROPERTY_OK; + if (arg && *(float *) arg <= 0) + mixer_incvolume(&mpctx->mixer); + else + mixer_decvolume(&mpctx->mixer); + return M_PROPERTY_OK; } return M_PROPERTY_NOT_IMPLEMENTED; } /// Mute (RW) static int mp_property_mute(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { if (!mpctx->sh_audio) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_SET: - if (mpctx->edl_muted) - return M_PROPERTY_DISABLED; - if (!arg) - return M_PROPERTY_ERROR; - if ((!!*(int *) arg) != mpctx->mixer.muted) - mixer_mute(&mpctx->mixer); - mpctx->user_muted = mpctx->mixer.muted; - return M_PROPERTY_OK; + if (mpctx->edl_muted) + return M_PROPERTY_DISABLED; + if (!arg) + return M_PROPERTY_ERROR; + if ((!!*(int *) arg) != mpctx->mixer.muted) + mixer_mute(&mpctx->mixer); + mpctx->user_muted = mpctx->mixer.muted; + return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: - if (mpctx->edl_muted) - return M_PROPERTY_DISABLED; - mixer_mute(&mpctx->mixer); - mpctx->user_muted = mpctx->mixer.muted; - return M_PROPERTY_OK; + if (mpctx->edl_muted) + return M_PROPERTY_DISABLED; + mixer_mute(&mpctx->mixer); + mpctx->user_muted = mpctx->mixer.muted; + return M_PROPERTY_OK; case M_PROPERTY_PRINT: - if (!arg) - return M_PROPERTY_ERROR; - if (mpctx->edl_muted) { - *(char **) arg = strdup(mp_gtext("enabled (EDL)")); - return M_PROPERTY_OK; - } + if (!arg) + return M_PROPERTY_ERROR; + if (mpctx->edl_muted) { + *(char **) arg = strdup(mp_gtext("enabled (EDL)")); + return M_PROPERTY_OK; + } default: - return m_property_flag(prop, action, arg, &mpctx->mixer.muted); + return m_property_flag(prop, action, arg, &mpctx->mixer.muted); } } /// Audio delay (RW) static int mp_property_audio_delay(m_option_t *prop, int action, - void *arg, MPContext *mpctx) + void *arg, MPContext *mpctx) { if (!(mpctx->sh_audio && mpctx->sh_video)) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_SET: case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: { - int ret; - float delay = audio_delay; - ret = m_property_delay(prop, action, arg, &audio_delay); - if (ret != M_PROPERTY_OK) - return ret; - if (mpctx->sh_audio) - mpctx->delay -= audio_delay - delay; - } - return M_PROPERTY_OK; + int ret; + float delay = audio_delay; + ret = m_property_delay(prop, action, arg, &audio_delay); + if (ret != M_PROPERTY_OK) + return ret; + if (mpctx->sh_audio) + mpctx->delay -= audio_delay - delay; + } + return M_PROPERTY_OK; default: - return m_property_delay(prop, action, arg, &audio_delay); + return m_property_delay(prop, action, arg, &audio_delay); } } /// Audio codec tag (RO) static int mp_property_audio_format(m_option_t *prop, int action, - void *arg, MPContext *mpctx) + void *arg, MPContext *mpctx) { if (!mpctx->sh_audio) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; return m_property_int_ro(prop, action, arg, mpctx->sh_audio->format); } @@ -741,25 +741,25 @@ static int mp_property_audio_codec(m_option_t *prop, int action, void *arg, MPContext *mpctx) { if (!mpctx->sh_audio || !mpctx->sh_audio->codec) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; return m_property_string_ro(prop, action, arg, mpctx->sh_audio->codec->name); } /// Audio bitrate (RO) static int mp_property_audio_bitrate(m_option_t *prop, int action, - void *arg, MPContext *mpctx) + void *arg, MPContext *mpctx) { if (!mpctx->sh_audio) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; return m_property_bitrate(prop, action, arg, mpctx->sh_audio->i_bps); } /// Samplerate (RO) static int mp_property_samplerate(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { if (!mpctx->sh_audio) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch(action) { case M_PROPERTY_PRINT: if(!arg) return M_PROPERTY_ERROR; @@ -772,84 +772,84 @@ static int mp_property_samplerate(m_option_t *prop, int action, void *arg, /// Number of channels (RO) static int mp_property_channels(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { if (!mpctx->sh_audio) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_PRINT: - if (!arg) - return M_PROPERTY_ERROR; - switch (mpctx->sh_audio->channels) { - case 1: - *(char **) arg = strdup("mono"); - break; - case 2: - *(char **) arg = strdup("stereo"); - break; - default: - *(char **) arg = malloc(32); - sprintf(*(char **) arg, "%d channels", mpctx->sh_audio->channels); - } - return M_PROPERTY_OK; + if (!arg) + return M_PROPERTY_ERROR; + switch (mpctx->sh_audio->channels) { + case 1: + *(char **) arg = strdup("mono"); + break; + case 2: + *(char **) arg = strdup("stereo"); + break; + default: + *(char **) arg = malloc(32); + sprintf(*(char **) arg, "%d channels", mpctx->sh_audio->channels); + } + return M_PROPERTY_OK; } return m_property_int_ro(prop, action, arg, mpctx->sh_audio->channels); } /// Balance (RW) static int mp_property_balance(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { float bal; if (!mpctx->sh_audio || mpctx->sh_audio->channels < 2) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_GET: - if (!arg) - return M_PROPERTY_ERROR; - mixer_getbalance(&mpctx->mixer, arg); - return M_PROPERTY_OK; + if (!arg) + return M_PROPERTY_ERROR; + mixer_getbalance(&mpctx->mixer, arg); + return M_PROPERTY_OK; case M_PROPERTY_PRINT: { - char** str = arg; - if (!arg) - return M_PROPERTY_ERROR; - mixer_getbalance(&mpctx->mixer, &bal); - if (bal == 0.f) - *str = strdup("center"); - else if (bal == -1.f) - *str = strdup("left only"); - else if (bal == 1.f) - *str = strdup("right only"); - else { - unsigned right = (bal + 1.f) / 2.f * 100.f; - *str = malloc(sizeof("left xxx%, right xxx%")); - sprintf(*str, "left %d%%, right %d%%", 100 - right, right); - } - return M_PROPERTY_OK; - } + char** str = arg; + if (!arg) + return M_PROPERTY_ERROR; + mixer_getbalance(&mpctx->mixer, &bal); + if (bal == 0.f) + *str = strdup("center"); + else if (bal == -1.f) + *str = strdup("left only"); + else if (bal == 1.f) + *str = strdup("right only"); + else { + unsigned right = (bal + 1.f) / 2.f * 100.f; + *str = malloc(sizeof("left xxx%, right xxx%")); + sprintf(*str, "left %d%%, right %d%%", 100 - right, right); + } + return M_PROPERTY_OK; + } case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: - mixer_getbalance(&mpctx->mixer, &bal); - bal += (arg ? *(float*)arg : .1f) * - (action == M_PROPERTY_STEP_UP ? 1.f : -1.f); - M_PROPERTY_CLAMP(prop, bal); - mixer_setbalance(&mpctx->mixer, bal); - return M_PROPERTY_OK; + mixer_getbalance(&mpctx->mixer, &bal); + bal += (arg ? *(float*)arg : .1f) * + (action == M_PROPERTY_STEP_UP ? 1.f : -1.f); + M_PROPERTY_CLAMP(prop, bal); + mixer_setbalance(&mpctx->mixer, bal); + return M_PROPERTY_OK; case M_PROPERTY_SET: - if (!arg) - return M_PROPERTY_ERROR; - M_PROPERTY_CLAMP(prop, *(float*)arg); - mixer_setbalance(&mpctx->mixer, *(float*)arg); - return M_PROPERTY_OK; + if (!arg) + return M_PROPERTY_ERROR; + M_PROPERTY_CLAMP(prop, *(float*)arg); + mixer_setbalance(&mpctx->mixer, *(float*)arg); + return M_PROPERTY_OK; } return M_PROPERTY_NOT_IMPLEMENTED; } /// Selected audio id (RW) static int mp_property_audio(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { struct MPOpts *opts = &mpctx->opts; int current_id, tmp; @@ -859,73 +859,73 @@ static int mp_property_audio(m_option_t *prop, int action, void *arg, switch (action) { case M_PROPERTY_GET: - if (!arg) - return M_PROPERTY_ERROR; - *(int *) arg = current_id; - return M_PROPERTY_OK; + if (!arg) + return M_PROPERTY_ERROR; + *(int *) arg = current_id; + return M_PROPERTY_OK; case M_PROPERTY_PRINT: - if (!arg) - return M_PROPERTY_ERROR; + if (!arg) + return M_PROPERTY_ERROR; - if (current_id < 0) - *(char **) arg = strdup(mp_gtext("disabled")); - else { - char lang[40]; + if (current_id < 0) + *(char **) arg = strdup(mp_gtext("disabled")); + else { + char lang[40]; strncpy(lang, mp_gtext("unknown"), sizeof(lang)); sh_audio_t* sh = mpctx->sh_audio; if (sh && sh->lang) av_strlcpy(lang, sh->lang, 40); #ifdef CONFIG_DVDREAD - else if (mpctx->stream->type == STREAMTYPE_DVD) { - int code = dvd_lang_from_aid(mpctx->stream, current_id); - if (code) { - lang[0] = code >> 8; - lang[1] = code; - lang[2] = 0; - } - } + else if (mpctx->stream->type == STREAMTYPE_DVD) { + int code = dvd_lang_from_aid(mpctx->stream, current_id); + if (code) { + lang[0] = code >> 8; + lang[1] = code; + lang[2] = 0; + } + } #endif #ifdef CONFIG_DVDNAV - else if (mpctx->stream->type == STREAMTYPE_DVDNAV) - mp_dvdnav_lang_from_aid(mpctx->stream, current_id, lang); + else if (mpctx->stream->type == STREAMTYPE_DVDNAV) + mp_dvdnav_lang_from_aid(mpctx->stream, current_id, lang); #endif - *(char **) arg = malloc(64); - snprintf(*(char **) arg, 64, "(%d) %s", current_id, lang); - } - return M_PROPERTY_OK; + *(char **) arg = malloc(64); + snprintf(*(char **) arg, 64, "(%d) %s", current_id, lang); + } + return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: case M_PROPERTY_SET: - if (action == M_PROPERTY_SET && arg) - tmp = *((int *) arg); - else - tmp = -1; + if (action == M_PROPERTY_SET && arg) + tmp = *((int *) arg); + else + tmp = -1; opts->audio_id = demuxer_switch_audio(mpctx->demuxer, tmp); if (opts->audio_id == -2 || (opts->audio_id > -1 - && mpctx->demuxer->audio->id != current_id && current_id != -2)) - uninit_player(mpctx, INITIALIZED_AO | INITIALIZED_ACODEC); + && mpctx->demuxer->audio->id != current_id && current_id != -2)) + uninit_player(mpctx, INITIALIZED_AO | INITIALIZED_ACODEC); if (opts->audio_id > -1 && mpctx->demuxer->audio->id != current_id) { - sh_audio_t *sh2; - sh2 = mpctx->demuxer->a_streams[mpctx->demuxer->audio->id]; - if (sh2) { - sh2->ds = mpctx->demuxer->audio; - mpctx->sh_audio = sh2; - reinit_audio_chain(mpctx); - } - } + sh_audio_t *sh2; + sh2 = mpctx->demuxer->a_streams[mpctx->demuxer->audio->id]; + if (sh2) { + sh2->ds = mpctx->demuxer->audio; + mpctx->sh_audio = sh2; + reinit_audio_chain(mpctx); + } + } mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_AUDIO_TRACK=%d\n", opts->audio_id); - return M_PROPERTY_OK; + return M_PROPERTY_OK; default: - return M_PROPERTY_NOT_IMPLEMENTED; + return M_PROPERTY_NOT_IMPLEMENTED; } } /// Selected video id (RW) static int mp_property_video(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { struct MPOpts *opts = &mpctx->opts; int current_id, tmp; @@ -935,80 +935,80 @@ static int mp_property_video(m_option_t *prop, int action, void *arg, switch (action) { case M_PROPERTY_GET: - if (!arg) - return M_PROPERTY_ERROR; - *(int *) arg = current_id; - return M_PROPERTY_OK; + if (!arg) + return M_PROPERTY_ERROR; + *(int *) arg = current_id; + return M_PROPERTY_OK; case M_PROPERTY_PRINT: - if (!arg) - return M_PROPERTY_ERROR; + if (!arg) + return M_PROPERTY_ERROR; - if (current_id < 0) - *(char **) arg = strdup(mp_gtext("disabled")); - else { - char lang[40]; + if (current_id < 0) + *(char **) arg = strdup(mp_gtext("disabled")); + else { + char lang[40]; strncpy(lang, mp_gtext("unknown"), sizeof(lang)); - *(char **) arg = malloc(64); - snprintf(*(char **) arg, 64, "(%d) %s", current_id, lang); - } - return M_PROPERTY_OK; + *(char **) arg = malloc(64); + snprintf(*(char **) arg, 64, "(%d) %s", current_id, lang); + } + return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: case M_PROPERTY_SET: - if (action == M_PROPERTY_SET && arg) - tmp = *((int *) arg); - else - tmp = -1; + if (action == M_PROPERTY_SET && arg) + tmp = *((int *) arg); + else + tmp = -1; opts->video_id = demuxer_switch_video(mpctx->demuxer, tmp); if (opts->video_id == -2 || (opts->video_id > -1 && mpctx->demuxer->video->id != current_id - && current_id != -2)) - uninit_player(mpctx, INITIALIZED_VCODEC | + && current_id != -2)) + uninit_player(mpctx, INITIALIZED_VCODEC | (mpctx->opts.fixed_vo && opts->video_id != -2 ? 0 : INITIALIZED_VO)); if (opts->video_id > -1 && mpctx->demuxer->video->id != current_id) { - sh_video_t *sh2; - sh2 = mpctx->demuxer->v_streams[mpctx->demuxer->video->id]; - if (sh2) { - sh2->ds = mpctx->demuxer->video; - mpctx->sh_video = sh2; - reinit_video_chain(mpctx); - } - } + sh_video_t *sh2; + sh2 = mpctx->demuxer->v_streams[mpctx->demuxer->video->id]; + if (sh2) { + sh2->ds = mpctx->demuxer->video; + mpctx->sh_video = sh2; + reinit_video_chain(mpctx); + } + } mp_msg(MSGT_IDENTIFY, MSGL_INFO, "ID_VIDEO_TRACK=%d\n", opts->video_id); - return M_PROPERTY_OK; + return M_PROPERTY_OK; default: - return M_PROPERTY_NOT_IMPLEMENTED; + return M_PROPERTY_NOT_IMPLEMENTED; } } static int mp_property_program(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { demux_program_t prog; switch (action) { case M_PROPERTY_STEP_UP: case M_PROPERTY_SET: - if (action == M_PROPERTY_SET && arg) - prog.progid = *((int *) arg); - else - prog.progid = -1; - if (demux_control - (mpctx->demuxer, DEMUXER_CTRL_IDENTIFY_PROGRAM, - &prog) == DEMUXER_CTRL_NOTIMPL) - return M_PROPERTY_ERROR; - - if (prog.aid < 0 && prog.vid < 0) { - mp_msg(MSGT_CPLAYER, MSGL_ERR, "Selected program contains no audio or video streams!\n"); - return M_PROPERTY_ERROR; - } - mp_property_do("switch_audio", M_PROPERTY_SET, &prog.aid, mpctx); - mp_property_do("switch_video", M_PROPERTY_SET, &prog.vid, mpctx); - return M_PROPERTY_OK; + if (action == M_PROPERTY_SET && arg) + prog.progid = *((int *) arg); + else + prog.progid = -1; + if (demux_control + (mpctx->demuxer, DEMUXER_CTRL_IDENTIFY_PROGRAM, + &prog) == DEMUXER_CTRL_NOTIMPL) + return M_PROPERTY_ERROR; + + if (prog.aid < 0 && prog.vid < 0) { + mp_msg(MSGT_CPLAYER, MSGL_ERR, "Selected program contains no audio or video streams!\n"); + return M_PROPERTY_ERROR; + } + mp_property_do("switch_audio", M_PROPERTY_SET, &prog.aid, mpctx); + mp_property_do("switch_video", M_PROPERTY_SET, &prog.vid, mpctx); + return M_PROPERTY_OK; default: - return M_PROPERTY_NOT_IMPLEMENTED; + return M_PROPERTY_NOT_IMPLEMENTED; } } @@ -1020,56 +1020,56 @@ static int mp_property_program(m_option_t *prop, int action, void *arg, /// Fullscreen state (RW) static int mp_property_fullscreen(m_option_t *prop, int action, void *arg, - MPContext *mpctx) + MPContext *mpctx) { if (!mpctx->video_out) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; switch (action) { case M_PROPERTY_SET: - if (!arg) - return M_PROPERTY_ERROR; - M_PROPERTY_CLAMP(prop, *(int *) arg); - if (vo_fs == !!*(int *) arg) - return M_PROPERTY_OK; + if (!arg) + return M_PROPERTY_ERROR; + M_PROPERTY_CLAMP(prop, *(int *) arg); + if (vo_fs == !!*(int *) arg) + return M_PROPERTY_OK; case M_PROPERTY_STEP_UP: case M_PROPERTY_STEP_DOWN: - if (mpctx->video_out->config_ok) - vo_control(mpctx->video_out, VOCTRL_FULLSCREEN, 0); + if (mpctx->video_out->config_ok) + vo_control(mpctx->video_out, VOCTRL_FULLSCREEN, 0); mpctx->opts.fullscreen = vo_fs; - return M_PROPERTY_OK; + return M_PROPERTY_OK; default: - return m_property_flag(prop, action, arg, &vo_fs); + return m_property_flag(prop, action, arg, &vo_fs); } } static int mp_property_deinterlace(m_option_t *prop, int action, - void *arg, MPContext *mpctx) + void *arg, MPContext *mpctx) { int deinterlace; vf_instance_t *vf; if (!mpctx->sh_video || !mpctx->sh_video->vfilter) - return M_PROPERTY_UNAVAILABLE; + return M_PROPERTY_UNAVAILABLE; vf = mpctx->sh_video->vfilter |