December 2011 - MPlayer-cvslog - lists.mplayerhq.hu

r34190 - in trunk: Changelog DOCS/man/en/mplayer.1 Makefile configure libmpcodecs/vf.c libmpcodecs/vf_lavfi.c
by cigaes 10 Oct '12

10 Oct '12

Author: cigaes Date: Wed Oct 12 13:38:10 2011 New Revision: 34190 Log: libmpcodec: add vf_lavfi. This filter wraps a complete libavfilter filter graph. As the API of libavfilter is not completely stable yet, the filter is not enabled by default, so as not to let mplayer unbuildable. Some strange behaviours may appear due to the very different model of buffer allocation between mplayer and lavfi. Added: trunk/libmpcodecs/vf_lavfi.c Modified: trunk/Changelog trunk/Makefile trunk/configure trunk/libmpcodecs/vf.c Changes in other areas also in this revision: Modified: trunk/DOCS/man/en/mplayer.1 Modified: trunk/Changelog ============================================================================== --- trunk/Changelog Wed Oct 12 13:38:08 2011 (r34189) +++ trunk/Changelog Wed Oct 12 13:38:10 2011 (r34190) @@ -11,6 +11,7 @@ MPlayer (1.0) Filters: * delogo: allow to change the rectangle based on the time. + * lavfi: libavfilter filter graphs (experimental). Other: * support adding noise at output resolution with -vo gl:noise-strength=8 Modified: trunk/Makefile ============================================================================== --- trunk/Makefile Wed Oct 12 13:38:08 2011 (r34189) +++ trunk/Makefile Wed Oct 12 13:38:10 2011 (r34190) @@ -83,6 +83,8 @@ SRCS_COMMON-$(FFMPEG) += stream/stream_ffmpeg.c \ sub/av_sub.c \ +SRCS_COMMON-$(CONFIG_VF_LAVFI) += libmpcodecs/vf_lavfi.c + # These filters use private headers and do not work with shared FFmpeg. SRCS_COMMON-$(FFMPEG_A) += libaf/af_lavcac3enc.c \ libmpcodecs/vf_fspp.c \ Modified: trunk/configure ============================================================================== --- trunk/configure Wed Oct 12 13:38:08 2011 (r34189) +++ trunk/configure Wed Oct 12 13:38:10 2011 (r34190) @@ -414,6 +414,7 @@ Codecs: --disable-libnut disable libnut [autodetect] --disable-ffmpeg_a disable static FFmpeg [autodetect] --disable-ffmpeg_so disable shared FFmpeg [autodetect] + --enable-vf-lavfi enable libavfilter wrapper [disabled] --disable-libavcodec_mpegaudio_hp disable high precision audio decoding in libavcodec [enabled] --disable-tremor-internal disable internal Tremor [enabled] @@ -647,6 +648,7 @@ _cross_compile=auto _prefix="/usr/local" ffmpeg_a=auto ffmpeg_so=auto +_vf_lavfi=no _libavcodec_mpegaudio_hp=yes _libopencore_amrnb=auto _libopencore_amrwb=auto @@ -1278,6 +1280,8 @@ for ac_option do --disable-ffmpeg_a) ffmpeg_a=no ;; --enable-ffmpeg_so) ffmpeg_so=yes ;; --disable-ffmpeg_so) ffmpeg_so=no ;; + --enable-vf-lavfi) _vf_lavfi=yes ;; + --disable-vf-lavfi) _vf_lavfi=no ;; --enable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=yes ;; --disable-libavcodec_mpegaudio_hp) _libavcodec_mpegaudio_hp=no ;; @@ -6773,6 +6777,7 @@ else def_ffmpeg_so='#undef CONFIG_FFMPEG_SO' nocodecmodules="ffmpeg $nocodecmodules" fi +test "$_vf_lavfi" = yes && def_vf_lavfi='#define CONFIG_VF_LAVFI 1' test "$_libavcodec_mpegaudio_hp" = yes && def_libavcodec_mpegaudio_hp='#define CONFIG_MPEGAUDIO_HP 1' && mak_libavcodec_mpegaudio_hp='CONFIG_MPEGAUDIO_HP = yes' @@ -8070,6 +8075,7 @@ CONFIG_GPL = yes CONFIG_MLIB = $_mlib CONFIG_MUXERS = $_mencoder CONFIG_RTPDEC = $networking +CONFIG_VF_LAVFI = $_vf_lavfi CONFIG_VDPAU = $_vdpau CONFIG_XVMC = $_xvmc CONFIG_ZLIB = $_zlib @@ -8522,6 +8528,7 @@ $def_roundf $def_threads $def_trunc $def_truncf +$def_vf_lavfi $def_xform_asm $def_xmm_clobbers $def_yasm Modified: trunk/libmpcodecs/vf.c ============================================================================== --- trunk/libmpcodecs/vf.c Wed Oct 12 13:38:08 2011 (r34189) +++ trunk/libmpcodecs/vf.c Wed Oct 12 13:38:10 2011 (r34190) @@ -82,6 +82,7 @@ extern const vf_info_t vf_info_ivtc; extern const vf_info_t vf_info_kerndeint; extern const vf_info_t vf_info_lavc; extern const vf_info_t vf_info_lavcdeint; +extern const vf_info_t vf_info_lavfi; extern const vf_info_t vf_info_mcdeint; extern const vf_info_t vf_info_mirror; extern const vf_info_t vf_info_noformat; @@ -142,6 +143,9 @@ static const vf_info_t* const filter_lis &vf_info_pp, &vf_info_lavc, &vf_info_lavcdeint, +#ifdef CONFIG_VF_LAVFI + &vf_info_lavfi, +#endif &vf_info_screenshot, &vf_info_geq, #endif Added: trunk/libmpcodecs/vf_lavfi.c ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/libmpcodecs/vf_lavfi.c Wed Oct 12 13:38:10 2011 (r34190) @@ -0,0 +1,418 @@ +/* + * Copyright (C) 2011 Nicolas George <nicolas.george(a)normalesup.org> + * + * 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. + */ + +#include "vf.h" +#include "m_struct.h" +#include "fmt-conversion.h" +#include "libavfilter/avfilter.h" +#include "libavfilter/avfiltergraph.h" +#include "libavutil/pixdesc.h" + +struct vf_priv_s { + AVFilterGraph *graph; + AVFilterContext *in; + AVFilterContext *out; + int in_w; + int in_h; + enum PixelFormat in_pixfmt; + int in_imgfmt; + AVRational in_sar; + int out_w; + int out_h; + enum PixelFormat out_pixfmt; + int out_imgfmt; + AVRational out_sar; + struct AVFilterBufferRef *in_buf; + mp_image_t *in_mpi; +}; + +static void buf_mpi_free(AVFilterBuffer *buf) +{ + ((mp_image_t *)buf->priv)->usage_count--; + av_free(buf); +} + +static AVFilterBufferRef *mpi_to_bufref(mp_image_t *mpi, enum PixelFormat fmt, + AVRational sar) +{ + AVFilterBufferRef *buf; + int perms = AV_PERM_READ; + + if ((mpi->flags & MP_IMGFLAG_ALLOCATED)) + perms |= AV_PERM_REUSE2; + if (!(mpi->flags & MP_IMGFLAG_PRESERVE)) + perms |= AV_PERM_WRITE; + buf = avfilter_get_video_buffer_ref_from_arrays(mpi->planes, mpi->stride, + perms, + mpi->w, mpi->h, + fmt); + buf->video->sample_aspect_ratio = sar; + buf->buf->priv = mpi; + buf->buf->free = buf_mpi_free; + return buf; +} + +static void bufref_to_mpi(AVFilterBufferRef *ref, mp_image_t *mpi) +{ + memcpy(mpi->planes, ref->data, sizeof(ref->data)); + memcpy(mpi->stride, ref->linesize, sizeof(ref->linesize)); +} + +struct mpsink_priv { + struct vf_instance *vf; +}; + +static int mpsink_init(AVFilterContext *ctx, + av_unused const char *args, void *opaque) +{ + struct mpsink_priv *c = ctx->priv; + c->vf = opaque; + return 0; +} + +static int mpsink_query_formats(AVFilterContext *ctx) +{ + struct mpsink_priv *c = ctx->priv; + struct vf_instance *vf = c->vf; + AVFilterFormats *all; + enum PixelFormat *sup; + unsigned i, nsup = 0; + int ifmt; + + all = avfilter_all_formats(AVMEDIA_TYPE_VIDEO); + sup = av_mallocz(sizeof(*sup) * (all->format_count + 1)); + if (!sup) + return AVERROR(errno); + for(i = 0; i < all->format_count; i++) { + ifmt = pixfmt2imgfmt(all->formats[i]); + if (vf->next->query_format(vf->next, ifmt) > 0) + sup[nsup++] = all->formats[i]; + } + sup[nsup++] = PIX_FMT_NONE; + avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(sup)); + av_free(sup); + return 0; +} + +static AVFilterBufferRef *mpsink_get_video_buffer(AVFilterLink *link, + int perms, int w, int h) +{ + struct mpsink_priv *c = link->dst->priv; + struct vf_instance *vf = c->vf; + mp_image_t *dmpi; + int type; + int flags = 0; + + type = MP_IMGTYPE_NUMBERED | (-1 << 16); + if ((perms & AV_PERM_PRESERVE)) + flags |= MP_IMGFLAG_PRESERVE; + if ((perms & AV_PERM_READ)) + flags |= MP_IMGFLAG_READABLE; + if ((perms & AV_PERM_NEG_LINESIZES)) + flags |= MP_IMGFLAG_ACCEPT_STRIDE; + if (vf->priv->in_mpi) { + type = vf->priv->in_mpi->type; + vf->priv->in_mpi = NULL; + } + dmpi = vf_get_image(vf->next, vf->priv->out_imgfmt, type, flags, w, h); + return mpi_to_bufref(dmpi, vf->priv->out_pixfmt, vf->priv->out_sar); +} + +static void mpsink_end_frame(AVFilterLink *link) +{ + struct mpsink_priv *c = link->dst->priv; + struct vf_instance *vf = c->vf; + AVFilterBufferRef *buf = link->cur_buf; + mp_image_t *mpi = buf->buf->priv; + double pts; + + pts = buf->pts == (int64_t)AV_NOPTS_VALUE ? MP_NOPTS_VALUE : + buf->pts * av_q2d(link->time_base); + mpi->pict_type = buf->video->pict_type; + mpi->fields = (buf->video->interlaced ? MP_IMGFIELD_INTERLACED : 0) | + (buf->video->top_field_first ? MP_IMGFIELD_TOP_FIRST : 0); + vf_next_put_image(vf, mpi, pts); + avfilter_unref_buffer(link->cur_buf); +} + +static AVFilter mpsink = { + .name = "mpsink", + .description = "Video sink for mplayer interaction", + .priv_size = sizeof(struct mpsink_priv), + + .init = mpsink_init, + .query_formats = mpsink_query_formats, + + .inputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .end_frame = mpsink_end_frame, + .get_video_buffer = mpsink_get_video_buffer, + .min_perms = AV_PERM_READ, }, + { .name = NULL }}, + .outputs = (AVFilterPad[]) {{ .name = NULL }}, +}; + +struct mpsrc_priv { + struct vf_instance *vf; +}; + +static int mpsrc_init(AVFilterContext *ctx, + av_unused const char *args, void *opaque) +{ + struct mpsrc_priv *c = ctx->priv; + c->vf = opaque; + return 0; +} + +static int mpsrc_query_formats(AVFilterContext *ctx) +{ + struct mpsrc_priv *c = ctx->priv; + enum PixelFormat pix_fmts[] = { c->vf->priv->in_pixfmt, PIX_FMT_NONE }; + avfilter_set_common_pixel_formats(ctx, avfilter_make_format_list(pix_fmts)); + return 0; +} + +static int mpsrc_config_props(AVFilterLink *link) +{ + struct mpsrc_priv *c = link->src->priv; + struct vf_instance *vf = c->vf; + link->w = vf->priv->in_w; + link->h = vf->priv->in_h; + link->sample_aspect_ratio = vf->priv->in_sar; + link->time_base = AV_TIME_BASE_Q; + return 0; +} + +static int mpsrc_request_frame(AVFilterLink *link) +{ + struct mpsrc_priv *c = link->src->priv; + struct vf_instance *vf = c->vf; + + if (!vf->priv->in_buf) + return AVERROR(EINVAL); + avfilter_start_frame(link, avfilter_ref_buffer(vf->priv->in_buf, ~0)); + avfilter_draw_slice(link, 0, link->h, 1); + avfilter_end_frame(link); + vf->priv->in_buf = NULL; + return 0; +} + +static int mpsrc_poll_frame(AVFilterLink *link) +{ + struct mpsrc_priv *c = link->src->priv; + struct vf_instance *vf = c->vf; + return vf->priv->in_buf != NULL; +} + +AVFilter mpsrc = { + .name = "mpsrc", + .description = "Video source for mplayer interaction", + .priv_size = sizeof(struct mpsrc_priv), + .query_formats = mpsrc_query_formats, + + .init = mpsrc_init, + + .inputs = (AVFilterPad[]) {{ .name = NULL }}, + .outputs = (AVFilterPad[]) {{ .name = "default", + .type = AVMEDIA_TYPE_VIDEO, + .request_frame = mpsrc_request_frame, + .poll_frame = mpsrc_poll_frame, + .config_props = mpsrc_config_props, }, + { .name = NULL }}, +}; + +static int config(struct vf_instance *vf, int w, int h, int dw, int dh, + unsigned flags, unsigned fmt) +{ + int ret; + AVFilterLink *out; + AVRational iar, dar; + + av_reduce(&iar.num, &iar.den, w, h, INT_MAX); + av_reduce(&dar.num, &dar.den, dw, dh, INT_MAX); + vf->priv->in_pixfmt = imgfmt2pixfmt(fmt); + vf->priv->in_imgfmt = fmt; + vf->priv->in_w = w; + vf->priv->in_h = h; + vf->priv->in_sar = av_div_q(dar, iar); + ret = avfilter_graph_config(vf->priv->graph, NULL); + if (ret < 0) + return 0; + out = vf->priv->out->inputs[0]; + vf->priv->out_w = out->w; + vf->priv->out_h = out->h; + vf->priv->out_pixfmt = out->format; + vf->priv->out_imgfmt = pixfmt2imgfmt(out->format); + vf->priv->out_sar = out->sample_aspect_ratio; + if (vf->priv->out_sar.num != vf->priv->in_sar.num || + vf->priv->out_sar.den != vf->priv->in_sar.den || + out->w != w || out->h != h) { + av_reduce(&iar.num, &iar.den, out->w, out->h, INT_MAX); + dar = av_mul_q(iar, out->sample_aspect_ratio); + if (av_cmp_q(dar, iar) >= 0) { + dh = out->h; + dw = av_rescale(dh, dar.num, dar.den); + } else { + dw = out->w; + dh = av_rescale(dw, dar.den, dar.num); + } + } + return vf_next_config(vf, out->w, out->h, dw, dh, flags, fmt); +} + +static void get_image(struct vf_instance *vf, mp_image_t *mpi) +{ + AVFilterBufferRef *buf; + unsigned perms = AV_PERM_WRITE | AV_PERM_REUSE2; + + avfilter_unref_buffer(mpi->priv); + mpi->priv = NULL; /* for safety */ + if (mpi->flags & MP_IMGFLAG_READABLE) + perms |= AV_PERM_READ; + if (mpi->flags & MP_IMGFLAG_PRESERVE) + perms |= AV_PERM_PRESERVE; + vf->priv->in_mpi = mpi; + buf = avfilter_get_video_buffer(vf->priv->in->outputs[0], perms, + mpi->w, mpi->h); + vf->priv->in_mpi = NULL; + bufref_to_mpi(buf, mpi); + mpi->flags |= MP_IMGFLAG_DIRECT; + mpi->flags &= ~MP_IMGFLAG_ALLOCATED; + mpi->priv = buf; +} + +static int put_image(struct vf_instance *vf, mp_image_t *mpi, double pts) +{ + AVFilterBufferRef *buf; + mp_image_t *cmpi = NULL; + + if (!(mpi->flags & MP_IMGFLAG_DIRECT)) { + cmpi = vf_get_image(vf, mpi->imgfmt, MP_IMGTYPE_TEMP, + MP_IMGFLAG_PREFER_ALIGNED_STRIDE, + mpi->w, mpi->h); + copy_mpi(cmpi, mpi); + buf = cmpi->priv; + } else { + buf = mpi->priv; + } + buf->video->key_frame = mpi->pict_type == 1; + buf->video->pict_type = mpi->pict_type; /* seems to be the same code */ + buf->video->interlaced = !!(mpi->fields & MP_IMGFIELD_INTERLACED); + buf->video->top_field_first = !!(mpi->fields & MP_IMGFIELD_TOP_FIRST); + vf->priv->in_buf = buf; + if (pts != MP_NOPTS_VALUE) + buf->pts = pts * AV_TIME_BASE; + while (avfilter_poll_frame(vf->priv->out->inputs[0])) { + if (avfilter_request_frame(vf->priv->out->inputs[0])) + break; + } + return 1; +} + +static void uninit(struct vf_instance *vf) +{ + unsigned i; + +#define FREE_MPI_ARRAY(field) \ + for (i = 0; i < FF_ARRAY_ELEMS(vf->imgctx.field); i++) \ + if (vf->imgctx.field[i]) \ + avfilter_unref_buffer(vf->imgctx.field[i]->priv); + FREE_MPI_ARRAY(static_images); + FREE_MPI_ARRAY(temp_images); + FREE_MPI_ARRAY(export_images); + FREE_MPI_ARRAY(numbered_images); + avfilter_graph_free(&vf->priv->graph); + av_free(vf->priv); +} + +static int lavfi_open(struct vf_instance *vf, char *args) +{ + AVFilterInOut *outputs; + AVFilterInOut *inputs; + int ret; + + avfilter_register_all(); + if (!args) { + mp_msg(MSGT_VFILTER, MSGL_ERR, "lavfi: filtergraph needed\n"); + goto fail; + } + if (args[0] == '$') { + char *e = getenv(args + 1); + if (!e) { + mp_msg(MSGT_VFILTER, MSGL_ERR, "lavfi: %s not defined\n", args); + goto fail; + } + args = e; + } + vf->priv = av_mallocz(sizeof(struct vf_priv_s)); + if (!vf->priv) + return 0; + + vf->priv->graph = avfilter_graph_alloc(); + if (!vf->priv->graph) + goto fail; + ret = avfilter_graph_create_filter(&vf->priv->in, &mpsrc, "in", + NULL, vf, vf->priv->graph); + if (ret < 0) + goto fail; + ret = avfilter_graph_create_filter(&vf->priv->out, &mpsink, "out", + NULL, vf, vf->priv->graph); + if (ret < 0) + return 0; + outputs = avfilter_inout_alloc(); + inputs = avfilter_inout_alloc(); + if (!outputs || !inputs) + goto fail; + outputs->name = av_strdup("in"); + outputs->filter_ctx = vf->priv->in; + outputs->pad_idx = 0; + outputs->next = NULL; + inputs->name = av_strdup("out"); + inputs->filter_ctx = vf->priv->out; + inputs->pad_idx = 0; + inputs->next = NULL; + ret = avfilter_graph_parse(vf->priv->graph, args, &inputs, &outputs, NULL); + if (ret < 0) + goto fail; + + vf->config = config; + vf->uninit = uninit; + vf->put_image = put_image; + vf->get_image = get_image; + return 1; + +fail: + avfilter_inout_free(&inputs); + avfilter_inout_free(&outputs); + avfilter_graph_free(&vf->priv->graph); + av_free(vf->priv); + return 0; +} + +static const m_option_t vf_opts_fields[] = { { .name = NULL } }; + +const vf_info_t vf_info_lavfi = { + "libavfilter wrapper", + "lavfi", + "Nicolas George", + "", + lavfi_open, + NULL, +};

4 3

r34132 - trunk/configure
by reimar 09 Jan '12

09 Jan '12

Author: reimar Date: Sun Sep 25 15:28:25 2011 New Revision: 34132 Log: Set up HAVE_VFP_ARGS and CONFIG_THUMB correctly to fix compilation for ARM. Modified: trunk/configure Modified: trunk/configure ============================================================================== --- trunk/configure Sun Sep 25 11:58:58 2011 (r34131) +++ trunk/configure Sun Sep 25 15:28:25 2011 (r34132) @@ -89,6 +89,15 @@ cxx_check() { compile_check $TMPCPP $@ -lstdc++ } +cpp_condition_check() { + cat > $TMPC << EOF +#if !($1) +#error condition not true: $1 +#endif +EOF + compile_check $TMPC $@ +} + cflag_check() { cat > $TMPC << EOF int main(void) { return 0; } @@ -560,6 +569,7 @@ Advanced options: --enable-armvfp enable ARM VFP (ARM) [autodetect] --enable-vfpv3 enable ARM VFPV3 (ARM) [autodetect] --enable-neon enable NEON (ARM) [autodetect] + --enable-thumb enable THUMB (ARM) [autodetect] --enable-iwmmxt enable iWMMXt (ARM) [autodetect] --disable-fastmemcpy disable 3DNow!/SSE/MMX optimized memcpy [enable] --enable-hardcoded-tables put tables in binary instead of calculating them at startup [disable] @@ -612,6 +622,7 @@ _armv6t2=auto _armvfp=auto vfpv3=auto neon=auto +armthumb=auto _iwmmxt=auto _mtrr=auto _altivec=auto @@ -1409,6 +1420,8 @@ for ac_option do --disable-vfpv3) vfpv3=no ;; --enable-neon) neon=yes ;; --disable-neon) neon=no ;; + --enable-thumb) armthumb=yes ;; + --disable-thumb) armthumb=no ;; --enable-iwmmxt) _iwmmxt=yes ;; --disable-iwmmxt) _iwmmxt=no ;; --enable-mmx) _mmx=yes ;; @@ -2865,6 +2878,16 @@ if arm ; then fi echores "$vfpv3" + echocheck "softfloat ABI" + softfloat=yes + cpp_condition_check 'defined(__ARM_PCS_VFP) || (!defined(__ARM_PCS) && !defined(__SOFTFP__))' && softfloat=no + if test $softfloat = "yes" ; then + def_vfp_args='#define HAVE_VFP_ARGS 0' + else + def_vfp_args='#define HAVE_VFP_ARGS 1' + fi + echores "$softfloat" + echocheck "ARM NEON" if test $neon = "auto" ; then neon=no @@ -2872,6 +2895,19 @@ if arm ; then fi echores "$neon" + echocheck "ARM THUMB" + if test $armthumb = "auto" ; then + armthumb=no + fi + if test $armthumb = "yes" ; then + extra_cflags="$extra_cflags -mthumb" + def_armthumb='#define CONFIG_THUMB 1' + else + extra_cflags="$extra_cflags -marm" + def_armthumb='#define CONFIG_THUMB 0' + fi + echores "$armthumb" + echocheck "iWMMXt (Intel XScale SIMD instructions)" if test $_iwmmxt = "auto" ; then _iwmmxt=no @@ -8280,6 +8316,8 @@ $def_bigendian $(ff_config_enable "$arch_all" "$arch" "#" "ARCH") $(ff_config_enable "$subarch_all" "$subarch" "#" "ARCH") $(ff_config_enable "$cpuexts_all" "$cpuexts" "#" "HAVE") +$def_armthumb +$def_vfp_args /* Blu-ray/DVD/VCD/CD */ @@ -8579,7 +8617,6 @@ $def_yasm #define HAVE_SYMVER_ASM_LABEL 0 #define HAVE_SYMVER_GNU_ASM 0 #define HAVE_SYS_SELECT_H 0 -#define HAVE_VFP_ARGS 1 #define HAVE_VIRTUALALLOC 0 /* Some FFmpeg codecs depend on these. Enable them unconditionally for now. */

5 11

r34475 - in trunk: DOCS/xml/de/skin.xml DOCS/xml/en/skin.xml gui/app.c gui/app.h gui/interface.c gui/ui/actions.c gui/ui/gtk/menu.c gui/ui/main.c gui/ui/pixmaps/cd.xpm gui/ui/pixmaps/dvd.xpm gui/ui...
by ib 31 Dec '11

31 Dec '11

Author: ib Date: Sat Dec 31 13:38:52 2011 New Revision: 34475 Log: Add audio CD playback support to the X11/GTK GUI. (The Win32 GUI already had this support. Add missing - although already used - user event evPlayCD here as well as internal event ivSetCDTrack - although it's unused - for consistency.) Added: trunk/gui/ui/pixmaps/cd.xpm trunk/gui/ui/pixmaps/playcd.xpm Modified: trunk/gui/app.c trunk/gui/app.h trunk/gui/interface.c trunk/gui/ui/actions.c trunk/gui/ui/gtk/menu.c trunk/gui/ui/main.c trunk/gui/ui/pixmaps/dvd.xpm trunk/gui/ui/pixmaps/playdvd.xpm trunk/gui/ui/render.c trunk/gui/util/string.c trunk/gui/win32/skinload.c trunk/gui/win32/skinload.h Changes in other areas also in this revision: Modified: trunk/DOCS/xml/de/skin.xml trunk/DOCS/xml/en/skin.xml trunk/help/help_mp-de.h trunk/help/help_mp-en.h Modified: trunk/gui/app.c ============================================================================== --- trunk/gui/app.c Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/app.c Sat Dec 31 13:38:52 2011 (r34475) @@ -51,6 +51,7 @@ static const evName evNames[] = { { evLoadSubtitle, "evLoadSubtitle" }, { evDropSubtitle, "evDropSubtitle" }, { evPlaylist, "evPlaylist" }, + { evPlayCD, "evPlayCD" }, { evPlayVCD, "evPlayVCD" }, { evPlayDVD, "evPlayDVD" }, { evLoadURL, "evSetURL" }, // legacy Modified: trunk/gui/app.h ============================================================================== --- trunk/gui/app.h Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/app.h Sat Dec 31 13:38:52 2011 (r34475) @@ -37,6 +37,7 @@ #define evLoadSubtitle 38 #define evDropSubtitle 43 #define evPlaylist 10 +#define evPlayCD 48 #define evPlayVCD 40 #define evPlayDVD 39 #define evLoadURL 5013 @@ -84,6 +85,7 @@ #define ivSetDVDTitle 5009 #define ivSetDVDChapter 5010 #define ivSetVCDTrack 5012 +#define ivSetCDTrack 5014 #define ivRedraw 7002 Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/interface.c Sat Dec 31 13:38:52 2011 (r34475) @@ -410,6 +410,17 @@ int gui(int what, void *data) case STREAMTYPE_STREAM: break; +#ifdef CONFIG_CDDA + case STREAMTYPE_CDDA: + { + char tmp[512]; + + sprintf(tmp, "cdda://%d", guiInfo.Track); + uiSetFileName(NULL, tmp, STREAMTYPE_CDDA); + } + break; +#endif + #ifdef CONFIG_VCD case STREAMTYPE_VCD: { @@ -611,6 +622,13 @@ int gui(int what, void *data) guiInfo.StreamType = stream->type; switch (guiInfo.StreamType) { +#ifdef CONFIG_CDDA + case STREAMTYPE_CDDA: + guiInfo.Tracks = 0; + stream_control(stream, STREAM_CTRL_GET_NUM_TITLES, &guiInfo.Tracks); + break; +#endif + #ifdef CONFIG_VCD case STREAMTYPE_VCD: guiInfo.Tracks = 0; @@ -772,6 +790,15 @@ int gui(int what, void *data) break; } +#ifdef CONFIG_CDDA + if (guiInfo.StreamType == STREAMTYPE_CDDA) { + uiNext(); + + if (guiInfo.Playing) + break; + } +#endif + if (guiInfo.Playing && (next = listSet(gtkGetNextPlItem, NULL)) && (plLastPlayed != next)) { plLastPlayed = next; uiSetFileName(next->path, next->name, STREAMTYPE_FILE); Modified: trunk/gui/ui/actions.c ============================================================================== --- trunk/gui/ui/actions.c Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/ui/actions.c Sat Dec 31 13:38:52 2011 (r34475) @@ -242,6 +242,11 @@ void uiCurr(void) return; switch (guiInfo.StreamType) { +#ifdef CONFIG_CDDA + case STREAMTYPE_CDDA: + break; +#endif + #ifdef CONFIG_VCD case STREAMTYPE_VCD: break; @@ -281,6 +286,15 @@ void uiPrev(void) return; switch (guiInfo.StreamType) { +#ifdef CONFIG_CDDA + case STREAMTYPE_CDDA: + if (--guiInfo.Track == 0) { + guiInfo.Track = 1; + stop = 1; + } + break; +#endif + #ifdef CONFIG_VCD case STREAMTYPE_VCD: if (--guiInfo.Track == 1) { @@ -335,6 +349,17 @@ void uiNext(void) return; switch (guiInfo.StreamType) { +#ifdef CONFIG_CDDA + case STREAMTYPE_CDDA: + + if (++guiInfo.Track > guiInfo.Tracks) { + guiInfo.Track = guiInfo.Tracks; + stop = 1; + } + + break; +#endif + #ifdef CONFIG_VCD case STREAMTYPE_VCD: Modified: trunk/gui/ui/gtk/menu.c ============================================================================== --- trunk/gui/ui/gtk/menu.c Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/ui/gtk/menu.c Sat Dec 31 13:38:52 2011 (r34475) @@ -66,6 +66,10 @@ #include "gui/ui/pixmaps/empty.xpm" #include "gui/ui/pixmaps/loadeaf.xpm" #include "gui/ui/pixmaps/title.xpm" +#ifdef CONFIG_CDDA +#include "gui/ui/pixmaps/cd.xpm" +#include "gui/ui/pixmaps/playcd.xpm" +#endif #ifdef CONFIG_VCD #include "gui/ui/pixmaps/vcd.xpm" #include "gui/ui/pixmaps/playvcd.xpm" @@ -404,6 +408,8 @@ GtkWidget * DVDSubtitleLanguageMenu; GtkWidget * AspectMenu; GtkWidget * VCDSubMenu; GtkWidget * VCDTitleMenu; +GtkWidget * CDSubMenu; +GtkWidget * CDTitleMenu; GtkWidget * create_PopUpMenu( void ) { @@ -425,6 +431,9 @@ GtkWidget * create_PopUpMenu( void ) AddSeparator( Menu ); SubMenu=AddSubMenu( window1, (const char*)open_xpm, Menu,MSGTR_MENU_Open ); AddMenuItem( window1, (const char*)file2_xpm, SubMenu,MSGTR_MENU_PlayFile" ", evLoadPlay ); +#ifdef CONFIG_CDDA + AddMenuItem( window1, (const char*)playcd_xpm, SubMenu,MSGTR_MENU_PlayCD, evPlayCD ); +#endif #ifdef CONFIG_VCD AddMenuItem( window1, (const char*)playvcd_xpm, SubMenu,MSGTR_MENU_PlayVCD, evPlayVCD ); #endif @@ -450,6 +459,27 @@ GtkWidget * create_PopUpMenu( void ) // AddMenuItem( SubMenu,MSGTR_MENU_NormalSize" ", evNormalSize ); // AddMenuItem( SubMenu,MSGTR_MENU_DoubleSize, evDoubleSize ); // AddMenuItem( SubMenu,MSGTR_MENU_FullScreen, evFullScreen ); +#ifdef CONFIG_CDDA + CDSubMenu=AddSubMenu( window1, (const char*)cd_xpm, Menu,MSGTR_MENU_CD ); + AddMenuItem( window1, (const char*)playcd_xpm, CDSubMenu,MSGTR_MENU_PlayDisc,evPlayCD ); + AddSeparator( CDSubMenu ); + CDTitleMenu=AddSubMenu( window1, (const char*)title_xpm, CDSubMenu,MSGTR_MENU_Titles ); + if ( guiInfo.Tracks ) + { + char tmp[32]; int i; + for ( i=1;i <= guiInfo.Tracks;i++ ) + { + snprintf( tmp,32,MSGTR_MENU_Title,i ); + //AddMenuItem( CDTitleMenu,tmp,( i << 16 ) + ivSetCDTrack ); + AddMenuItem(window1, (const char*)empty_xpm, CDTitleMenu,tmp,( i << 16 ) + ivSetCDTrack ); + } + } + else + { + MenuItem=AddMenuItem( window1, (const char*)empty_xpm, CDTitleMenu,MSGTR_MENU_None,evNone ); + gtk_widget_set_sensitive( MenuItem,FALSE ); + } +#endif #ifdef CONFIG_VCD VCDSubMenu=AddSubMenu( window1, (const char*)vcd_xpm, Menu,MSGTR_MENU_VCD ); AddMenuItem( window1, (const char*)playvcd_xpm, VCDSubMenu,MSGTR_MENU_PlayDisc,evPlayVCD ); Modified: trunk/gui/ui/main.c ============================================================================== --- trunk/gui/ui/main.c Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/ui/main.c Sat Dec 31 13:38:52 2011 (r34475) @@ -162,6 +162,14 @@ void uiEventHandling( int msg,float para mp_property_do("sub",M_PROPERTY_SET,&iparam,guiInfo.mpcontext); break; +#ifdef CONFIG_CDDA + case ivSetCDTrack: + guiInfo.Track=iparam; + case evPlayCD: + guiInfoMediumClear ( CLEAR_ALL ); + guiInfo.StreamType=STREAMTYPE_CDDA; + goto play; +#endif #ifdef CONFIG_VCD case ivSetVCDTrack: guiInfo.Track=iparam; @@ -202,6 +210,19 @@ play: guiInfo.Track=1; guiInfo.NewPlay=GUI_FILE_NEW; break; +#ifdef CONFIG_CDDA + case STREAMTYPE_CDDA: + guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE ); + if ( !cdrom_device ) cdrom_device=gstrdup( DEFAULT_CDROM_DEVICE ); + uiSetFileName( NULL,cdrom_device,STREAMTYPE_CDDA ); + if ( guiInfo.Playing != GUI_PAUSE ) + { + if ( !guiInfo.Track ) + guiInfo.Track=1; + guiInfo.NewPlay=GUI_FILE_SAME; + } + break; +#endif #ifdef CONFIG_VCD case STREAMTYPE_VCD: guiInfoMediumClear( CLEAR_ALL - CLEAR_VCD - CLEAR_FILE ); Added: trunk/gui/ui/pixmaps/cd.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/ui/pixmaps/cd.xpm Sat Dec 31 13:38:52 2011 (r34475) @@ -0,0 +1,129 @@ +/* XPM */ +static const char * const cd_xpm[] = { +"16 16 110 2", +" c None", +". c #CACCD2", +"+ c #D3D4D6", +"@ c #D2D2D3", +"# c #D1D1D2", +"$ c #D1D1D3", +"% c #B5B8BD", +"& c #EDEDEC", +"* c #FAFAFA", +"= c #FBFBFB", +"- c #FCFCFC", +"; c #FFFFFF", +"> c #D9D9D9", +", c #AFB1B5", +"' c #C6C6C7", +") c #FDFDFD", +"! c #F7F7F7", +"~ c #F9F9F9", +"{ c #F6F6F6", +"] c #F8F8F8", +"^ c #B8B9BD", +"/ c #B2B4BA", +"( c #EAE9E9", +"_ c #DCDCDC", +": c #F3F3F3", +"< c #F4F4F4", +"[ c #A8AAAF", +"} c #CBCBCA", +"| c #CCCCCC", +"1 c #D7D7D7", +"2 c #E1E1E1", +"3 c #F5F5F5", +"4 c #EFEFEF", +"5 c #CCCDCE", +"6 c #D2D2D2", +"7 c #CDCDCD", +"8 c #D6D6D6", +"9 c #E0E0E0", +"0 c #E7E7E7", +"a c #E6E6E6", +"b c #E5E5E5", +"c c #EBEBEB", +"d c #E3E3E3", +"e c #ECECEC", +"f c #9C9DA5", +"g c #C4C5C9", +"h c #C1C1C1", +"i c #CECECE", +"j c #E2E2E2", +"k c #E8E8E8", +"l c #D8D8D8", +"m c #E4E4E3", +"n c #DBDBDB", +"o c #F2F2F2", +"p c #DDDDDD", +"q c #D4D4D4", +"r c #A2A4AA", +"s c #C9CACC", +"t c #C4C4C4", +"u c #CFCFCF", +"v c #E4E4E4", +"w c #DBDAD9", +"x c #727789", +"y c #DFDEDD", +"z c #C8C8C8", +"A c #BCBCBC", +"B c #BFBFBF", +"C c #9E9FA4", +"D c #C6C7C9", +"E c #E2E2E1", +"F c #999CA6", +"G c #C5C5C4", +"H c #D3D3D3", +"I c #C7C7C7", +"J c #BBBBBB", +"K c #BABABA", +"L c #C4C4C3", +"M c #95969A", +"N c #C4C5C6", +"O c #D8D8D7", +"P c #CACACA", +"Q c #C6C6C6", +"R c #B9B9B9", +"S c #CCCCCB", +"T c #939395", +"U c #A0A2A7", +"V c #E5E5E4", +"W c #FEFEFE", +"X c #C5C5C5", +"Y c #C2C2C2", +"Z c #B8B8B8", +"` c #BCBBBA", +" . c #A3A6AD", +".. c #9B9C9F", +"+. c #F0F0F0", +"@. c #C0C0C0", +"#. c #7C7E84", +"$. c #EAEAEA", +"%. c #979798", +"&. c #989BA2", +"*. c #E9E9E9", +"=. c #959596", +"-. c #A6A8AD", +";. c #B7B7B5", +">. c #B4B4B3", +",. c #8B8D92", +"'. c #9B9DA0", +"). c #B6B6B7", +"!. c #B0B0B1", +"~. c #929396", +" . + @ # $ ", +" % & * = = = - ; > , ", +" ' ) ! ~ ~ ~ { ] * = ) ^ ", +" / ( _ : ! ] ! < ! ] ) ) = [ ", +" } | 1 2 { ] ! : 3 - - 3 4 5 ", +" 6 7 8 9 0 ] a b ) = : c d e f ", +"g h i 1 j k 6 l m n o 0 p q 2 r ", +"s t u n v _ w x y p 8 z A B C ", +"D 8 l 2 k d E F ^ G H I J K L M ", +"N v j k e = _ O 6 P Q A R K S T ", +"U V k c ; W 3 > ! 6 X Y R Z ` .", +" ..+.; : : > : : : X X h @.#. ", +" 1 = : > : : : : $.X I %. ", +" &.Q a > : : +.v *.< =. ", +" -.;.P j k p >.,. ", +" '.).!.~. "}; Modified: trunk/gui/ui/pixmaps/dvd.xpm ============================================================================== --- trunk/gui/ui/pixmaps/dvd.xpm Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/ui/pixmaps/dvd.xpm Sat Dec 31 13:38:52 2011 (r34475) @@ -1,129 +1,120 @@ /* XPM */ static const char * const dvd_xpm[] = { -"16 16 110 2", -" c None", -". c #CACCD2", -"+ c #D3D4D6", -"@ c #D2D2D3", -"# c #D1D1D2", -"$ c #D1D1D3", -"% c #B5B8BD", -"& c #EDEDEC", -"* c #FAFAFA", -"= c #FBFBFB", -"- c #FCFCFC", -"; c #FFFFFF", -"> c #D9D9D9", -", c #AFB1B5", -"' c #C6C6C7", -") c #FDFDFD", -"! c #F7F7F7", -"~ c #F9F9F9", -"{ c #F6F6F6", -"] c #F8F8F8", -"^ c #B8B9BD", -"/ c #B2B4BA", -"( c #EAE9E9", -"_ c #DCDCDC", -": c #F3F3F3", -"< c #F4F4F4", -"[ c #A8AAAF", -"} c #CBCBCA", -"| c #CCCCCC", -"1 c #D7D7D7", -"2 c #E1E1E1", -"3 c #F5F5F5", -"4 c #EFEFEF", -"5 c #CCCDCE", -"6 c #D2D2D2", -"7 c #CDCDCD", -"8 c #D6D6D6", -"9 c #E0E0E0", -"0 c #E7E7E7", -"a c #E6E6E6", -"b c #E5E5E5", -"c c #EBEBEB", -"d c #E3E3E3", -"e c #ECECEC", -"f c #9C9DA5", -"g c #C4C5C9", -"h c #C1C1C1", -"i c #CECECE", -"j c #E2E2E2", -"k c #E8E8E8", -"l c #D8D8D8", -"m c #E4E4E3", -"n c #DBDBDB", -"o c #F2F2F2", -"p c #DDDDDD", -"q c #D4D4D4", -"r c #A2A4AA", -"s c #C9CACC", -"t c #C4C4C4", -"u c #CFCFCF", -"v c #E4E4E4", -"w c #DBDAD9", -"x c #727789", -"y c #DFDEDD", -"z c #C8C8C8", -"A c #BCBCBC", -"B c #BFBFBF", -"C c #9E9FA4", -"D c #C6C7C9", -"E c #E2E2E1", -"F c #999CA6", -"G c #C5C5C4", -"H c #D3D3D3", -"I c #C7C7C7", -"J c #BBBBBB", -"K c #BABABA", -"L c #C4C4C3", -"M c #95969A", -"N c #C4C5C6", -"O c #D8D8D7", -"P c #CACACA", -"Q c #C6C6C6", -"R c #B9B9B9", -"S c #CCCCCB", -"T c #939395", -"U c #A0A2A7", -"V c #E5E5E4", -"W c #FEFEFE", -"X c #C5C5C5", -"Y c #C2C2C2", -"Z c #B8B8B8", -"` c #BCBBBA", -" . c #A3A6AD", -".. c #9B9C9F", -"+. c #F0F0F0", -"@. c #C0C0C0", -"#. c #7C7E84", -"$. c #EAEAEA", -"%. c #979798", -"&. c #989BA2", -"*. c #E9E9E9", -"=. c #959596", -"-. c #A6A8AD", -";. c #B7B7B5", -">. c #B4B4B3", -",. c #8B8D92", -"'. c #9B9DA0", -"). c #B6B6B7", -"!. c #B0B0B1", -"~. c #929396", -" . + @ # $ ", -" % & * = = = - ; > , ", -" ' ) ! ~ ~ ~ { ] * = ) ^ ", -" / ( _ : ! ] ! < ! ] ) ) = [ ", -" } | 1 2 { ] ! : 3 - - 3 4 5 ", -" 6 7 8 9 0 ] a b ) = : c d e f ", -"g h i 1 j k 6 l m n o 0 p q 2 r ", -"s t u n v _ w x y p 8 z A B C ", -"D 8 l 2 k d E F ^ G H I J K L M ", -"N v j k e = _ O 6 P Q A R K S T ", -"U V k c ; W 3 > ! 6 X Y R Z ` .", -" ..+.; : : > : : : X X h @.#. ", -" 1 = : > : : : : $.X I %. ", -" &.Q a > : : +.v *.< =. ", -" -.;.P j k p >.,. ", -" '.).!.~. "}; +"16 16 100 2", +" c #000000", +"! c #7277FF", +"# c #7C7EFF", +"$ c #8B8DFF", +"% c #9293FF", +"& c #9393FF", +"' c #9595FF", +"( c #9596FF", +") c #9797FF", +"* c #989BFF", +"+ c #999CFF", +", c #9B9CFF", +"- c #9B9DFF", +". c #9C9DFF", +"/ c #9E9FFF", +"0 c #A0A2FF", +"1 c #A2A4FF", +"2 c #A3A6FF", +"3 c #A6A8FF", +"4 c #A8AAFF", +"5 c #B0B0FF", +"6 c #AFB1FF", +"7 c #B2B4FF", +"8 c #B4B4FF", +"9 c #B6B6FF", +": c #B7B7FF", +"; c #B5B8FF", +"< c #B8B8FF", +"= c #B8B9FF", +"> c #B9B9FF", +"? c #BABAFF", +"@ c #BBBBFF", +"A c #BCBBFF", +"B c #BCBCFF", +"C c #BFBFFF", +"D c #C0C0FF", +"E c #C1C1FF", +"F c #C2C2FF", +"G c #C4C4FF", +"H c #C4C5FF", +"I c #C5C5FF", +"J c #C6C6FF", +"K c #C6C7FF", +"L c #C7C7FF", +"M c #C8C8FF", +"N c #C9CAFF", +"O c #CACAFF", +"P c #CBCBFF", +"Q c #CACCFF", +"R c #CCCCFF", +"S c #CCCDFF", +"T c #CDCDFF", +"U c #CECEFF", +"V c #CFCFFF", +"W c #D1D1FF", +"X c #D2D2FF", +"Y c #D3D3FF", +"Z c #D3D4FF", +"[ c #D4D4FF", +"[] c #D6D6FF", +"] c #D7D7FF", +"^ c #D8D8FF", +"_ c #D9D9FF", +"` c #DBDAFF", +"a c #DBDBFF", +"b c #DCDCFF", +"c c #DDDDFF", +"d c #DFDEFF", +"e c #E0E0FF", +"f c #E1E1FF", +"g c #E2E2FF", +"h c #E3E3FF", +"i c #E4E4FF", +"j c #E5E5FF", +"k c #E6E6FF", +"l c #E7E7FF", +"m c #E8E8FF", +"n c #E9E9FF", +"o c #EAE9FF", +"p c #EAEAFF", +"q c #EBEBFF", +"r c #ECECFF", +"s c #EDEDFF", +"t c #EFEFFF", +"u c #F0F0FF", +"v c #F2F2FF", +"w c #F3F3FF", +"x c #F4F4FF", +"y c #F5F5FF", +"z c #F6F6FF", +"{ c #F7F7FF", +"| c #F8F8FF", +"} c #F9F9FF", +"~ c #FAFAFF", +" ! c #FBFBFF", +"!! c #FCFCFF", +"#! c #FDFDFF", +"$! c #FEFEFF", +"%! c #FFFFFF", +"&! c None", +"&!&!&!&!&!Q Z X W W &!&!&!&!&!&!", +"&!&!&!; s ~ ! ! !!!%!_ 6 &!&!&!", +"&!&!J #!{ } } } z | ~ !#!= &!&!", +"&!7 o b w { | { x { | #!#! !4 &!", +"&!P R ] f z | { w y !!!!y t S &!", +"&!X T []e l | k j #! !w q h r . ", +"H E U ] g m X ^ i a v l c [ f 1 ", +"N G V a i b ` &!! d c []M B C / ", +"K []^ f m h g + = I Y L @ ? G ( ", +"H i g m r !b ^ X O J B > ? R & ", +"0 j m q %!$!y _ { X I F > < A 2 ", +"&!, u %!w w _ w w w I I E D # &!", +"&!&!] !w _ w w w w p I L ) &!&!", +"&!&!* J k _ w w u i n x ' &!&!&!", +"&!&!&!&!3 : O g m c 8 $ &!&!&!&!", +"&!&!&!&!&!&!- 9 5 % &!&!&!&!&!&!" +}; Added: trunk/gui/ui/pixmaps/playcd.xpm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ trunk/gui/ui/pixmaps/playcd.xpm Sat Dec 31 13:38:52 2011 (r34475) @@ -0,0 +1,137 @@ +/* XPM */ +static const char * const playcd_xpm[] = { +"16 16 118 2", +" c None", +". c #CACCD2", +"+ c #D3D4D6", +"@ c #D2D2D3", +"# c #D1D1D2", +"$ c #D1D1D3", +"% c #B5B8BD", +"& c #EDEDEC", +"* c #FAFAFA", +"= c #FBFBFB", +"- c #FCFCFC", +"; c #FFFFFF", +"> c #D9D9D9", +", c #AFB1B5", +"' c #C6C6C7", +") c #FDFDFD", +"! c #F7F7F7", +"~ c #F9F9F9", +"{ c #F6F6F6", +"] c #F8F8F8", +"^ c #B8B9BD", +"/ c #B2B4BA", +"( c #EAE9E9", +"_ c #DCDCDC", +": c #F3F3F3", +"< c #F4F4F4", +"[ c #A8AAAF", +"} c #CBCBCA", +"| c #CCCCCC", +"1 c #D7D7D7", +"2 c #E1E1E1", +"3 c #F5F5F5", +"4 c #EFEFEF", +"5 c #CCCDCE", +"6 c #D2D2D2", +"7 c #CDCDCD", +"8 c #D6D6D6", +"9 c #E0E0E0", +"0 c #E7E7E7", +"a c #E6E6E6", +"b c #E5E5E5", +"c c #EBEBEB", +"d c #E3E3E3", +"e c #ECECEC", +"f c #9C9DA5", +"g c #C4C5C9", +"h c #C1C1C1", +"i c #CECECE", +"j c #E2E2E2", +"k c #E8E8E8", +"l c #D8D8D8", +"m c #E4E4E3", +"n c #DBDBDB", +"o c #F2F2F2", +"p c #404040", +"q c #DDDDDD", +"r c #D4D4D4", +"s c #A2A4AA", +"t c #C9CACC", +"u c #C4C4C4", +"v c #CFCFCF", +"w c #E4E4E4", +"x c #DBDAD9", +"y c #727789", +"z c #DFDEDD", +"A c #292828", +"B c #373737", +"C c #BCBCBC", +"D c #BFBFBF", +"E c #9E9FA4", +"F c #C6C7C9", +"G c #E2E2E1", +"H c #999CA6", +"I c #C5C5C4", +"J c #D3D3D3", +"K c #313131", +"L c #747472", +"M c #5C5C5C", +"N c #C4C4C3", +"O c #95969A", +"P c #C4C5C6", +"Q c #D8D8D7", +"R c #CACACA", +"S c #C6C6C6", +"T c #343333", +"U c #A1A09E", +"V c #939290", +"W c #939395", +"X c #A0A2A7", +"Y c #E5E5E4", +"Z c #FEFEFE", +"` c #C5C5C5", +" . c #363635", +".. c #A7A6A3", +"+. c #B8B7B4", +"@. c #91908E", +"#. c #9B9C9F", +"$. c #F0F0F0", +"%. c #383737", +"&. c #B0AFAC", +"*. c #C8C7C4", +"=. c #5A5A59", +"-. c #EAEAEA", +";. c #3E3D3D", +">. c #BEBCB9", +",. c #151414", +"'. c #989BA2", +"). c #E9E9E9", +"!. c #41403F", +"~. c #696867", +"{. c #A6A8AD", +"]. c #B7B7B5", +"^. c #B4B4B3", +"/. c #0A0A0A", +"(. c #9B9DA0", +"_. c #B6B6B7", +":. c #B0B0B1", +"<. c #929396", +" . + @ # $ ", +" % & * = = = - ; > , ", +" ' ) ! ~ ~ ~ { ] * = ) ^ ", +" / ( _ : ! ] ! < ! ] ) ) = [ ", +" } | 1 2 { ] ! : 3 - - 3 4 5 ", +" 6 7 8 9 0 ] a b ) = : c d e f ", +"g h i 1 j k 6 l m n o p q r 2 s ", +"t u v n w _ x y z q A B C D E ", +"F 8 l 2 k d G H ^ I J K L M N O ", +"P w j k e = _ Q 6 R S T U V M W ", +"X Y k c ; Z 3 > ! 6 ` ...+.@.M ", +" #.$.; : : > : : : ` %.&.*.=. ", +" 1 = : > : : : : -.;.>.,. ", +" '.S a > : : $.w ).!.~.Z ", +" {.].R j k q ^./.; ", +" (._.:.<. D "}; Modified: trunk/gui/ui/pixmaps/playdvd.xpm ============================================================================== --- trunk/gui/ui/pixmaps/playdvd.xpm Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/ui/pixmaps/playdvd.xpm Sat Dec 31 13:38:52 2011 (r34475) @@ -1,137 +1,129 @@ /* XPM */ static const char * const playdvd_xpm[] = { -"16 16 118 2", -" c None", -". c #CACCD2", -"+ c #D3D4D6", -"@ c #D2D2D3", -"# c #D1D1D2", -"$ c #D1D1D3", -"% c #B5B8BD", -"& c #EDEDEC", -"* c #FAFAFA", -"= c #FBFBFB", -"- c #FCFCFC", -"; c #FFFFFF", -"> c #D9D9D9", -", c #AFB1B5", -"' c #C6C6C7", -") c #FDFDFD", -"! c #F7F7F7", -"~ c #F9F9F9", -"{ c #F6F6F6", -"] c #F8F8F8", -"^ c #B8B9BD", -"/ c #B2B4BA", -"( c #EAE9E9", -"_ c #DCDCDC", -": c #F3F3F3", -"< c #F4F4F4", -"[ c #A8AAAF", -"} c #CBCBCA", -"| c #CCCCCC", -"1 c #D7D7D7", -"2 c #E1E1E1", -"3 c #F5F5F5", -"4 c #EFEFEF", -"5 c #CCCDCE", -"6 c #D2D2D2", -"7 c #CDCDCD", -"8 c #D6D6D6", -"9 c #E0E0E0", -"0 c #E7E7E7", -"a c #E6E6E6", -"b c #E5E5E5", -"c c #EBEBEB", -"d c #E3E3E3", -"e c #ECECEC", -"f c #9C9DA5", -"g c #C4C5C9", -"h c #C1C1C1", -"i c #CECECE", -"j c #E2E2E2", -"k c #E8E8E8", -"l c #D8D8D8", -"m c #E4E4E3", -"n c #DBDBDB", -"o c #F2F2F2", -"p c #404040", -"q c #DDDDDD", -"r c #D4D4D4", -"s c #A2A4AA", -"t c #C9CACC", -"u c #C4C4C4", -"v c #CFCFCF", -"w c #E4E4E4", -"x c #DBDAD9", -"y c #727789", -"z c #DFDEDD", -"A c #292828", -"B c #373737", -"C c #BCBCBC", -"D c #BFBFBF", -"E c #9E9FA4", -"F c #C6C7C9", -"G c #E2E2E1", -"H c #999CA6", -"I c #C5C5C4", -"J c #D3D3D3", -"K c #313131", -"L c #747472", -"M c #5C5C5C", -"N c #C4C4C3", -"O c #95969A", -"P c #C4C5C6", -"Q c #D8D8D7", -"R c #CACACA", -"S c #C6C6C6", -"T c #343333", -"U c #A1A09E", -"V c #939290", -"W c #939395", -"X c #A0A2A7", -"Y c #E5E5E4", -"Z c #FEFEFE", -"` c #C5C5C5", -" . c #363635", -".. c #A7A6A3", -"+. c #B8B7B4", -"@. c #91908E", -"#. c #9B9C9F", -"$. c #F0F0F0", -"%. c #383737", -"&. c #B0AFAC", -"*. c #C8C7C4", -"=. c #5A5A59", -"-. c #EAEAEA", -";. c #3E3D3D", -">. c #BEBCB9", -",. c #151414", -"'. c #989BA2", -"). c #E9E9E9", -"!. c #41403F", -"~. c #696867", -"{. c #A6A8AD", -"]. c #B7B7B5", -"^. c #B4B4B3", -"/. c #0A0A0A", -"(. c #9B9DA0", -"_. c #B6B6B7", -":. c #B0B0B1", -"<. c #929396", -" . + @ # $ ", -" % & * = = = - ; > , ", -" ' ) ! ~ ~ ~ { ] * = ) ^ ", -" / ( _ : ! ] ! < ! ] ) ) = [ ", -" } | 1 2 { ] ! : 3 - - 3 4 5 ", -" 6 7 8 9 0 ] a b ) = : c d e f ", -"g h i 1 j k 6 l m n o p q r 2 s ", -"t u v n w _ x y z q A B C D E ", -"F 8 l 2 k d G H ^ I J K L M N O ", -"P w j k e = _ Q 6 R S T U V M W ", -"X Y k c ; Z 3 > ! 6 ` ...+.@.M ", -" #.$.; : : > : : : ` %.&.*.=. ", -" 1 = : > : : : : -.;.>.,. ", -" '.S a > : : $.w ).!.~.Z ", -" {.].R j k q ^./.; ", -" (._.:.<. D "}; +"16 16 109 2", +" c #000000", +"! c #0A0A0A", +"# c #151414", +"$ c #292828", +"% c #313131", +"& c #343333", +"' c #363635", +"( c #373737", +") c #383737", +"* c #3E3D3D", +"+ c #41403F", +", c #404040", +"- c #5A5A59", +". c #5C5C5C", +"/ c #696867", +"0 c #747472", +"1 c #91908E", +"2 c #939290", +"3 c #A1A09E", +"4 c #A7A6A3", +"5 c #B0AFAC", +"6 c #B8B7B4", +"7 c #BEBCB9", +"8 c #C8C7C4", +"9 c #7277FF", +": c #9293FF", +"; c #9393FF", +"< c #9596FF", +"= c #989BFF", +"> c #999CFF", +"? c #9B9CFF", +"@ c #9B9DFF", +"A c #9C9DFF", +"B c #9E9FFF", +"C c #A0A2FF", +"D c #A2A4FF", +"E c #A6A8FF", +"F c #A8AAFF", +"G c #B0B0FF", +"H c #AFB1FF", +"I c #B2B4FF", +"J c #B4B4FF", +"K c #B6B6FF", +"L c #B7B7FF", +"M c #B5B8FF", +"N c #B8B9FF", +"O c #BCBCFF", +"P c #BFBFFF", +"Q c #C1C1FF", +"R c #C4C4FF", +"S c #C4C5FF", +"T c #C5C5FF", +"U c #C6C6FF", +"V c #C6C7FF", +"W c #C9CAFF", +"X c #CACAFF", +"Y c #CBCBFF", +"Z c #CACCFF", +"[ c #CCCCFF", +"[] c #CCCDFF", +"] c #CDCDFF", +"^ c #CECEFF", +"_ c #CFCFFF", +"` c #D1D1FF", +"a c #D2D2FF", +"b c #D3D3FF", +"c c #D3D4FF", +"d c #D4D4FF", +"e c #D6D6FF", +"f c #D7D7FF", +"g c #D8D8FF", +"h c #D9D9FF", +"i c #DBDAFF", +"j c #DBDBFF", +"k c #DCDCFF", +"l c #DDDDFF", +"m c #DFDEFF", +"n c #E0E0FF", +"o c #E1E1FF", +"p c #E2E2FF", +"q c #E3E3FF", +"r c #E4E4FF", +"s c #E5E5FF", +"t c #E6E6FF", +"u c #E7E7FF", +"v c #E8E8FF", +"w c #E9E9FF", +"x c #EAE9FF", +"y c #EAEAFF", +"z c #EBEBFF", +"{ c #ECECFF", +"| c #EDEDFF", +"} c #EFEFFF", +"~ c #F0F0FF", +" ! c #F2F2FF", +"!! c #F3F3FF", +"#! c #F4F4FF", +"$! c #F5F5FF", +"%! c #F6F6FF", +"&! c #F7F7FF", +"'! c #F8F8FF", +"(! c #F9F9FF", +")! c #FAFAFF", +"*! c #FBFBFF", +"+! c #FCFCFF", +",! c #FDFDFF", +"-! c #FEFEFF", +".! c #FFFFFF", +"/! c None", +"/!/!/!/!/!Z c a ` ` /!/!/!/!/!/!", +"/!/!/!M | )!*!*!*!+!.!h H /!/!/!", +"/!/!U ,!&!(!(!(!%!'!)!*!,!N /!/!", +"/!I x k !!&!'!&!#!&!'!,!,!*!F /!", +"/!Y [ f o %!'!&!!!$!+!+!$!} []/!", +"/!a ] e n u '!t s ,!*!!!z q { A ", +"S Q ^ f p v a g r j !, l d o D ", +"W R _ j r k i /!9 m l $ ( O P B ", +"V e g o v q p > N T b % 0 . R < ", +"S r p v { *!k g a X U & 3 2 . ; ", +"C s v z .!-!$!h &!a T ' 4 6 1 . ", +"/!? ~ .!!!!!h !!!!!!T ) 5 8 - /!", +"/!/!f *!!!h !!!!!!!!y * 7 # /!/!", +"/!/!= U t h !!!!~ r w + / -!/!/!", +"/!/!/!/!E L X p v l J ! .!/!/!/!", +"/!/!/!/!/!/!@ K G : /!P /!/!/!/!" +}; Modified: trunk/gui/ui/render.c ============================================================================== --- trunk/gui/ui/render.c Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/ui/render.c Sat Dec 31 13:38:52 2011 (r34475) @@ -206,6 +206,12 @@ calclengthmmmmss: av_strlcat(trbuf, "u", sizeof(trbuf)); break; +#ifdef CONFIG_CDDA + case STREAMTYPE_CDDA: + av_strlcat(trbuf, "a", sizeof(trbuf)); + break; +#endif + #ifdef CONFIG_VCD case STREAMTYPE_VCD: av_strlcat(trbuf, "v", sizeof(trbuf)); Modified: trunk/gui/util/string.c ============================================================================== --- trunk/gui/util/string.c Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/util/string.c Sat Dec 31 13:38:52 2011 (r34475) @@ -283,6 +283,12 @@ char *TranslateFilename(int how, char *f av_strlcpy(fname, guiInfo.Filename, maxlen); break; +#ifdef CONFIG_CDDA + case STREAMTYPE_CDDA: + snprintf(fname, maxlen, MSGTR_Title, guiInfo.Track); + break; +#endif + #ifdef CONFIG_VCD case STREAMTYPE_VCD: snprintf(fname, maxlen, MSGTR_Title, guiInfo.Track - 1); Modified: trunk/gui/win32/skinload.c ============================================================================== --- trunk/gui/win32/skinload.c Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/win32/skinload.c Sat Dec 31 13:38:52 2011 (r34475) @@ -57,6 +57,7 @@ static const evName evNames[] = { evLoadSubtitle, "evLoadSubtitle" }, { evDropSubtitle, "evDropSubtitle" }, { evPlaylist, "evPlaylist" }, + { evPlayCD, "evPlayCD" }, { evPlayVCD, "evPlayVCD" }, { evPlayDVD, "evPlayDVD" }, { evLoadURL, "evSetURL" }, // legacy Modified: trunk/gui/win32/skinload.h ============================================================================== --- trunk/gui/win32/skinload.h Sat Dec 31 13:20:08 2011 (r34474) +++ trunk/gui/win32/skinload.h Sat Dec 31 13:38:52 2011 (r34475) @@ -192,6 +192,7 @@ skin_t *loadskin(char *skindir, int desk #define ivSetDVDTitle 5009 #define ivSetDVDChapter 5010 #define ivSetVCDTrack 5012 +#define ivSetCDTrack 5014 #define ivRedraw 7002

3 3

r34481 - trunk/gui/win32/interface.c
by ib 31 Dec '11

31 Dec '11

Author: ib Date: Sat Dec 31 14:42:24 2011 New Revision: 34481 Log: Cosmetic: Collect together Wine port related functions. Modified: trunk/gui/win32/interface.c Modified: trunk/gui/win32/interface.c ============================================================================== --- trunk/gui/win32/interface.c Sat Dec 31 14:25:23 2011 (r34480) +++ trunk/gui/win32/interface.c Sat Dec 31 14:42:24 2011 (r34481) @@ -83,6 +83,42 @@ mixer_t *mixer = NULL; #ifdef __WINE__ /** + * @brief Convert a Windows style path to a file name into an Unix style one. + * + * @param filename pointer to the file path to be converted + * + * @return pointer to the converted file path + */ +static char *unix_name (char *filename) +{ + static char *unix_filename; + LPSTR (*CDECL wine_get_unix_file_name_ptr)(LPCWSTR); + int wchar_conv; + + if (*filename && (filename[1] == ':')) + { + wine_get_unix_file_name_ptr = (void *) GetProcAddress(GetModuleHandleA("KERNEL32"), "wine_get_unix_file_name"); + wchar_conv = MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, NULL, 0); + + if (wine_get_unix_file_name_ptr && wchar_conv) + { + WCHAR *ntpath; + char *unix_name; + + ntpath = HeapAlloc(GetProcessHeap(), 0, sizeof(*ntpath) * (wchar_conv + 1)); + MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, ntpath, wchar_conv); + unix_name = wine_get_unix_file_name_ptr(ntpath); + setdup(&unix_filename, unix_name); + filename = unix_filename; + HeapFree(GetProcessHeap(), 0, unix_name); + HeapFree(GetProcessHeap(), 0, ntpath); + } + } + + return filename; +} + +/** * @brief Convert a Windows style device name into an Unix style one. * * @param device pointer to the device name to be converted @@ -388,44 +424,6 @@ void uiPrev(void) mygui->startplay(mygui); } -#ifdef __WINE__ -/** - * @brief Convert a Windows style path to a file name into an Unix style one. - * - * @param filename pointer to the file path to be converted - * - * @return pointer to the converted file path - */ -static char *unix_name (char *filename) -{ - static char *unix_filename; - LPSTR (*CDECL wine_get_unix_file_name_ptr)(LPCWSTR); - int wchar_conv; - - if (*filename && (filename[1] == ':')) - { - wine_get_unix_file_name_ptr = (void *) GetProcAddress(GetModuleHandleA("KERNEL32"), "wine_get_unix_file_name"); - wchar_conv = MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, NULL, 0); - - if (wine_get_unix_file_name_ptr && wchar_conv) - { - WCHAR *ntpath; - char *unix_name; - - ntpath = HeapAlloc(GetProcessHeap(), 0, sizeof(*ntpath) * (wchar_conv + 1)); - MultiByteToWideChar(CP_UNIXCP, 0, filename, -1, ntpath, wchar_conv); - unix_name = wine_get_unix_file_name_ptr(ntpath); - setdup(&unix_filename, unix_name); - filename = unix_filename; - HeapFree(GetProcessHeap(), 0, unix_name); - HeapFree(GetProcessHeap(), 0, ntpath); - } - } - - return filename; -} -#endif - void uiSetFileName(char *dir, char *name, int type) { if(!name) return;

1 0

r34480 - trunk/gui/win32/interface.c
by ib 31 Dec '11

31 Dec '11

Author: ib Date: Sat Dec 31 14:25:23 2011 New Revision: 34480 Log: Allow Windows style devices for Wine port. Determine the Linux style device by asking Wine's mount manager. Modified: trunk/gui/win32/interface.c Modified: trunk/gui/win32/interface.c ============================================================================== --- trunk/gui/win32/interface.c Sat Dec 31 14:20:29 2011 (r34479) +++ trunk/gui/win32/interface.c Sat Dec 31 14:25:23 2011 (r34480) @@ -25,6 +25,11 @@ #if defined(__CYGWIN__) || defined(__WINE__) #define _beginthreadex CreateThread +#ifdef __WINE__ +#include <winioctl.h> +#define WINE_MOUNTMGR_EXTENSIONS +#include <ddk/mountmgr.h> +#endif #else #include <process.h> #endif @@ -76,6 +81,53 @@ const ao_functions_t *audio_out = NULL; const vo_functions_t *video_out = NULL; mixer_t *mixer = NULL; +#ifdef __WINE__ +/** + * @brief Convert a Windows style device name into an Unix style one. + * + * @param device pointer to the device name to be converted + * + * @return pointer to the converted device name + */ +static char *unix_device (char *device) +{ + static char *unix_devname; + HANDLE mgr; + DWORD size = 1024; + + mgr = CreateFileW(MOUNTMGR_DOS_DEVICE_NAME, GENERIC_READ | GENERIC_WRITE, FILE_SHARE_READ | FILE_SHARE_WRITE, NULL, OPEN_EXISTING, 0, 0); + + if (mgr != INVALID_HANDLE_VALUE) + { + struct mountmgr_unix_drive input; + struct mountmgr_unix_drive *data; + + data = HeapAlloc(GetProcessHeap(), 0, size); + + if (data) + { + memset(&input, 0, sizeof(input)); + input.letter = *device; + + if (DeviceIoControl(mgr, IOCTL_MOUNTMGR_QUERY_UNIX_DRIVE, &input, sizeof(input), data, size, NULL, NULL)) + { + if (data->device_offset) + { + setdup(&unix_devname, (char *) data + data->device_offset); + device = unix_devname; + } + } + + HeapFree(GetProcessHeap(), 0, data); + } + + CloseHandle(mgr); + } + + return device; +} +#endif + /* test for playlist files, no need to specify -playlist on the commandline. * add any conceivable playlist extensions here. * - Erik @@ -119,6 +171,12 @@ static void guiSetEvent(int event) guiInfo.Angle = 1; guiInfo.NewPlay = GUI_FILE_SAME; +#ifdef __WINE__ + // dvd_device is in the Windows style (D:\), which needs to be + // converted for MPlayer, so that it will find the device in the + // Linux filesystem. + dvd_device = unix_device(dvd_device); +#endif uiSetFileName(NULL, dvd_device, STREAMTYPE_DVD); dvdname[0] = 0; strcat(dvdname, "DVD Movie");

1 0

r34479 - in trunk/gui/win32: gui.c interface.c
by ib 31 Dec '11

31 Dec '11

Author: ib Date: Sat Dec 31 14:20:29 2011 New Revision: 34479 Log: Fix Win32 GUI DVD playback. The "open disk" menu item for DVDs didn't work. Reported by Stephen Sheldon, sfsheldo gmail com. Modified: trunk/gui/win32/gui.c trunk/gui/win32/interface.c Modified: trunk/gui/win32/gui.c ============================================================================== --- trunk/gui/win32/gui.c Sat Dec 31 14:15:30 2011 (r34478) +++ trunk/gui/win32/gui.c Sat Dec 31 14:20:29 2011 (r34479) @@ -1055,7 +1055,6 @@ static LRESULT CALLBACK EventProc(HWND h #ifdef CONFIG_DVDREAD free(dvd_device); dvd_device = strdup(device + pos); - dvd_title = dvd_chapter = dvd_angle = 1; handlemsg(hWnd, evPlayDVD); #endif } Modified: trunk/gui/win32/interface.c ============================================================================== --- trunk/gui/win32/interface.c Sat Dec 31 14:15:30 2011 (r34478) +++ trunk/gui/win32/interface.c Sat Dec 31 14:20:29 2011 (r34479) @@ -114,9 +114,9 @@ static void guiSetEvent(int event) case evPlayDVD: { static char dvdname[MAX_PATH]; - guiInfo.Track = dvd_title; - guiInfo.Chapter = dvd_chapter; - guiInfo.Angle = dvd_angle; + guiInfo.Track = 1; + guiInfo.Chapter = 1; + guiInfo.Angle = 1; guiInfo.NewPlay = GUI_FILE_SAME; uiSetFileName(NULL, dvd_device, STREAMTYPE_DVD); @@ -125,10 +125,9 @@ static void guiSetEvent(int event) GetVolumeInformation(dvd_device, dvdname, MAX_PATH, NULL, NULL, NULL, NULL, 0); capitalize(dvdname); mp_msg(MSGT_GPLAYER, MSGL_V, "Opening DVD %s -> %s\n", dvd_device, dvdname); - gui(GUI_PREPARE, (void *) STREAMTYPE_DVD); mygui->playlist->clear_playlist(mygui->playlist); mygui->playlist->add_track(mygui->playlist, filename, NULL, dvdname, 0); - mygui->startplay(mygui); + uiPlay(); break; } #endif @@ -502,31 +501,17 @@ int gui(int what, void *data) dvd_title = 0; force_fps = 0; if(!mygui->playlist->tracks) return 0; - uiSetFileName(NULL, mygui->playlist->tracks[mygui->playlist->current]->filename, STREAMTYPE_FILE); - guiInfo.Track = mygui->playlist->current + 1; - guiInfo.VideoWindow = 1; - if(gtkAONorm) greplace(&af_cfg.list, "volnorm", "volnorm"); - if(gtkAOExtraStereo) - { - char *name = malloc(12 + 20 + 1); - snprintf(name, 12 + 20, "extrastereo=%f", gtkAOExtraStereoMul); - name[12 + 20] = 0; - greplace(&af_cfg.list, "extrastereo", name); - free(name); - } - if(gtkCacheOn) stream_cache_size = gtkCacheSize; - if(gtkAutoSyncOn) autosync = gtkAutoSync; - guiInfo.NewPlay = 0; switch(guiInfo.StreamType) { case STREAMTYPE_FILE: case STREAMTYPE_STREAM: + uiSetFileName(NULL, mygui->playlist->tracks[mygui->playlist->current]->filename, STREAMTYPE_FILE); + guiInfo.Track = mygui->playlist->current + 1; break; #ifdef CONFIG_DVDREAD case STREAMTYPE_DVD: { char tmp[512]; - dvd_title = guiInfo.Track; dvd_chapter = guiInfo.Chapter; dvd_angle = guiInfo.Angle; sprintf(tmp,"dvd://%d", guiInfo.Track); @@ -535,6 +520,19 @@ int gui(int what, void *data) } #endif } + guiInfo.VideoWindow = 1; + if(gtkAONorm) greplace(&af_cfg.list, "volnorm", "volnorm"); + if(gtkAOExtraStereo) + { + char *name = malloc(12 + 20 + 1); + snprintf(name, 12 + 20, "extrastereo=%f", gtkAOExtraStereoMul); + name[12 + 20] = 0; + greplace(&af_cfg.list, "extrastereo", name); + free(name); + } + if(gtkCacheOn) stream_cache_size = gtkCacheSize; + if(gtkAutoSyncOn) autosync = gtkAutoSync; + guiInfo.NewPlay = 0; break; } case GUI_SET_AUDIO:

1 0

r34478 - in trunk/gui/win32: dialogs.h preferences.c wincfg.c
by ib 31 Dec '11

31 Dec '11

Author: ib Date: Sat Dec 31 14:15:30 2011 New Revision: 34478 Log: Remove options cdrom_device and dvd_device from the Win32 GUI. Windows determines these devices by directly checking all drives for type CDROM (and may handle even multiple of them). Modified: trunk/gui/win32/dialogs.h trunk/gui/win32/preferences.c trunk/gui/win32/wincfg.c Modified: trunk/gui/win32/dialogs.h ============================================================================== --- trunk/gui/win32/dialogs.h Sat Dec 31 13:55:28 2011 (r34477) +++ trunk/gui/win32/dialogs.h Sat Dec 31 14:15:30 2011 (r34478) @@ -68,8 +68,6 @@ #define ID_OSD1 34 #define ID_OSD2 35 #define ID_OSD3 36 -#define ID_DVDDEVICE 37 -#define ID_CDDEVICE 38 #define ID_PRIO 39 #define ID_URL 40 #define ID_TITLESEL 41 Modified: trunk/gui/win32/preferences.c ============================================================================== --- trunk/gui/win32/preferences.c Sat Dec 31 13:55:28 2011 (r34477) +++ trunk/gui/win32/preferences.c Sat Dec 31 14:15:30 2011 (r34478) @@ -61,11 +61,9 @@ static void set_defaults(void) static LRESULT CALLBACK PrefsWndProc(HWND hwnd, UINT iMsg, WPARAM wParam, LPARAM lParam) { - HWND btn, label, edit1, edit2, edit3, updown1, updown2, track1, track2; + HWND btn, label, edit1, edit2, updown1, updown2, track1, track2; static HWND vo_driver, ao_driver, prio; int i = 0, j = 0; - char dvddevice[MAX_PATH]; - char cdromdevice[MAX_PATH]; char procprio[11]; float x = 10.0, y = 100.0, stereopos, delaypos; stereopos = gtkAOExtraStereoMul * x; @@ -111,20 +109,6 @@ static LRESULT CALLBACK PrefsWndProc(HWN NULL); SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - label = CreateWindow("static", acp(MSGTR_PREFERENCES_DVDDevice), - WS_CHILD | WS_VISIBLE | SS_RIGHT, - 55, 387, 100, 15, hwnd, - NULL, ((LPCREATESTRUCT) lParam) -> hInstance, - NULL); - SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - - label = CreateWindow("static", acp(MSGTR_PREFERENCES_CDROMDevice), - WS_CHILD | WS_VISIBLE | SS_RIGHT, - 185, 387, 100, 15, hwnd, - NULL, ((LPCREATESTRUCT) lParam) -> hInstance, - NULL); - SendMessage(label, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - label = CreateWindow("static", acp(MSGTR_PREFERENCES_Priority), WS_CHILD | WS_VISIBLE | SS_RIGHT, 200, 286, 100, 15, hwnd, @@ -360,25 +344,6 @@ static LRESULT CALLBACK PrefsWndProc(HWN (HWND)edit2, 0, 0, 0); SendDlgItemMessage(hwnd, ID_UPDOWN2, UDM_SETRANGE32, (WPARAM)0, (LPARAM)10000); - /* dvd and cd devices */ - edit3 = CreateWindowEx(WS_EX_CLIENTEDGE, "edit", NULL, - WS_CHILD | WS_VISIBLE | - ES_LEFT | ES_AUTOHSCROLL, - 165, 384, 20, 20, hwnd, - (HMENU) ID_DVDDEVICE, - ((LPCREATESTRUCT) lParam) -> hInstance, - NULL); - SendMessage(edit3, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - - edit3 = CreateWindowEx(WS_EX_CLIENTEDGE, "edit", NULL, - WS_CHILD | WS_VISIBLE | - ES_LEFT| ES_AUTOHSCROLL, - 295, 384, 20, 20, hwnd, - (HMENU) ID_CDDEVICE, - ((LPCREATESTRUCT) lParam) -> hInstance, - NULL); - SendMessage(edit3, WM_SETFONT, (WPARAM) GetStockObject(DEFAULT_GUI_FONT), 0); - while(video_out_drivers[i]) { const vo_info_t *info = video_out_drivers[i++]->info; @@ -476,14 +441,6 @@ static LRESULT CALLBACK PrefsWndProc(HWN else if(osd_level == 3) SendDlgItemMessage(hwnd, ID_OSD3, BM_SETCHECK, 1, 0); - if(dvd_device) - SendDlgItemMessage(hwnd, ID_DVDDEVICE, WM_SETTEXT, 0, (LPARAM)dvd_device); - else SendDlgItemMessage(hwnd, ID_DVDDEVICE, WM_SETTEXT, 0, (LPARAM)"D:"); - - if(cdrom_device) - SendDlgItemMessage(hwnd, ID_CDDEVICE, WM_SETTEXT, 0, (LPARAM)cdrom_device); - else SendDlgItemMessage(hwnd, ID_CDDEVICE, WM_SETTEXT, 0, (LPARAM)"D:"); - if(proc_priority) SendDlgItemMessage(hwnd, ID_PRIO, CB_SETCURSEL, (WPARAM)SendMessage(prio, CB_FINDSTRING, -1, @@ -577,8 +534,6 @@ static LRESULT CALLBACK PrefsWndProc(HWN SendDlgItemMessage(hwnd, ID_OSD1, BM_SETCHECK, 1, 0); SendDlgItemMessage(hwnd, ID_OSD2, BM_SETCHECK, 0, 0); SendDlgItemMessage(hwnd, ID_OSD3, BM_SETCHECK, 0, 0); - SendDlgItemMessage(hwnd, ID_DVDDEVICE, WM_SETTEXT, 0, (LPARAM)"D:"); - SendDlgItemMessage(hwnd, ID_CDDEVICE, WM_SETTEXT, 0, (LPARAM)"D:"); SendMessage(hwnd, WM_COMMAND, (WPARAM)ID_APPLY, 0); break; } @@ -677,12 +632,6 @@ static LRESULT CALLBACK PrefsWndProc(HWN else if(SendDlgItemMessage(hwnd, ID_OSD3, BM_GETCHECK, 0, 0) == BST_CHECKED) osd_level = 3; - /* dvd and cd devices */ - SendDlgItemMessage(hwnd, ID_DVDDEVICE, WM_GETTEXT, MAX_PATH, (LPARAM)dvddevice); - dvd_device = strdup(dvddevice); - SendDlgItemMessage(hwnd, ID_CDDEVICE, WM_GETTEXT, MAX_PATH, (LPARAM)cdromdevice); - cdrom_device = strdup(cdromdevice); - MessageBox(hwnd, acp(MSGTR_PREFERENCES_Message), acp(MSGTR_MSGBOX_LABEL_Warning), MB_OK); DestroyWindow(hwnd); break; Modified: trunk/gui/win32/wincfg.c ============================================================================== --- trunk/gui/win32/wincfg.c Sat Dec 31 13:55:28 2011 (r34477) +++ trunk/gui/win32/wincfg.c Sat Dec 31 14:15:30 2011 (r34478) @@ -70,8 +70,6 @@ static const m_option_t gui_opts[] = { "ao_extra_stereo", &gtkAOExtraStereo, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "ao_extra_stereo_coefficient", &gtkAOExtraStereoMul, CONF_TYPE_FLOAT, CONF_RANGE, -10, 10, NULL }, { "delay", &audio_delay, CONF_TYPE_FLOAT, CONF_RANGE, -100.0, 100.0, NULL}, - { "dvd_device", &dvd_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, - { "cdrom_device", &cdrom_device, CONF_TYPE_STRING, 0, 0, 0, NULL }, { "osd_level", &osd_level, CONF_TYPE_INT, CONF_RANGE, 0, 3, NULL }, { "cache", &gtkCacheOn, CONF_TYPE_FLAG, 0, 0, 1, NULL }, { "cache_size", &gtkCacheSize, CONF_TYPE_INT, CONF_RANGE, -1, 65535, NULL },

1 0

r34477 - trunk/gui/interface.c
by ib 31 Dec '11

31 Dec '11

Author: ib Date: Sat Dec 31 13:55:28 2011 New Revision: 34477 Log: Retrieve DVD's titles, chapters and angles by stream control commands. Don't access the private vmg_file member structure. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Sat Dec 31 13:45:46 2011 (r34476) +++ trunk/gui/interface.c Sat Dec 31 13:55:28 2011 (r34477) @@ -638,10 +638,13 @@ int gui(int what, void *data) #ifdef CONFIG_DVDREAD case STREAMTYPE_DVD: + guiInfo.Tracks = 0; + stream_control(stream, STREAM_CTRL_GET_NUM_TITLES, &guiInfo.Tracks); + guiInfo.Chapters = 0; + stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiInfo.Chapters); + guiInfo.Angles = 0; + stream_control(stream, STREAM_CTRL_GET_NUM_ANGLES, &guiInfo.Angles); dvd = stream->priv; - guiInfo.Tracks = dvd->vmg_file->tt_srpt->nr_of_srpts; - guiInfo.Chapters = dvd->vmg_file->tt_srpt->title[dvd_title].nr_of_ptts; - guiInfo.Angles = dvd->vmg_file->tt_srpt->title[dvd_title].nr_of_angles; guiInfo.AudioStreams = dvd->nr_of_channels; memcpy(guiInfo.AudioStream, dvd->audio_streams, sizeof(dvd->audio_streams)); guiInfo.Subtitles = dvd->nr_of_subtitles;

1 0

r34476 - trunk/gui/interface.c
by ib 31 Dec '11

31 Dec '11

Author: ib Date: Sat Dec 31 13:45:46 2011 New Revision: 34476 Log: Replace VCD's STREAM_CTRL_GET_NUM_CHAPTERS by STREAM_CTRL_GET_NUM_TITLES. Although both commands are synonymous, it's more consistent. Modified: trunk/gui/interface.c Modified: trunk/gui/interface.c ============================================================================== --- trunk/gui/interface.c Sat Dec 31 13:38:52 2011 (r34475) +++ trunk/gui/interface.c Sat Dec 31 13:45:46 2011 (r34476) @@ -632,7 +632,7 @@ int gui(int what, void *data) #ifdef CONFIG_VCD case STREAMTYPE_VCD: guiInfo.Tracks = 0; - stream_control(stream, STREAM_CTRL_GET_NUM_CHAPTERS, &guiInfo.Tracks); + stream_control(stream, STREAM_CTRL_GET_NUM_TITLES, &guiInfo.Tracks); break; #endif

1 0

r34474 - in trunk: DOCS/tech/slave.txt command.c libmpdemux/demuxer.h stream/stream.h stream/stream_cdda.c stream/stream_dvd.c stream/stream_vcd.c
by ib 31 Dec '11

31 Dec '11

Author: ib Date: Sat Dec 31 13:20:08 2011 New Revision: 34474 Log: Add new stream control command STREAM_CTRL_GET_NUM_TITLES. This provides the total number of titles (aka tracks) of CDs / VCDs / DVDs. Additionally, add a titles property to the get_property slave command. Modified: trunk/DOCS/tech/slave.txt trunk/command.c trunk/libmpdemux/demuxer.h trunk/stream/stream.h trunk/stream/stream_cdda.c trunk/stream/stream_dvd.c trunk/stream/stream_vcd.c Modified: trunk/DOCS/tech/slave.txt ============================================================================== --- trunk/DOCS/tech/slave.txt Thu Dec 29 20:42:58 2011 (r34473) +++ trunk/DOCS/tech/slave.txt Sat Dec 31 13:20:08 2011 (r34474) @@ -530,6 +530,7 @@ stream_start pos 0 stream_end pos 0 X end pos in stream stream_length pos 0 X (end - start) stream_time_pos time 0 X present position in stream (in seconds) +titles int X number of titles chapter int 0 X X X select chapter chapters int X number of chapters angle int 0 X X X select angle Modified: trunk/command.c ============================================================================== --- trunk/command.c Thu Dec 29 20:42:58 2011 (r34473) +++ trunk/command.c Sat Dec 31 13:20:08 2011 (r34474) @@ -515,6 +515,17 @@ static int mp_property_chapter(m_option_ return M_PROPERTY_OK; } +/// Number of titles in file +static int mp_property_titles(m_option_t *prop, int action, void *arg, + MPContext *mpctx) +{ + if (!mpctx->demuxer) + return M_PROPERTY_UNAVAILABLE; + if (mpctx->demuxer->num_titles == 0) + stream_control(mpctx->demuxer->stream, STREAM_CTRL_GET_NUM_TITLES, &mpctx->demuxer->num_titles); + return m_property_int_ro(prop, action, arg, mpctx->demuxer->num_titles); +} + /// Number of chapters in file static int mp_property_chapters(m_option_t *prop, int action, void *arg, MPContext *mpctx) @@ -2142,6 +2153,8 @@ static const m_option_t mp_properties[] M_OPT_MIN, 0, 0, NULL }, { "chapter", mp_property_chapter, CONF_TYPE_INT, M_OPT_MIN, 0, 0, NULL }, + { "titles", mp_property_titles, CONF_TYPE_INT, + 0, 0, 0, NULL }, { "chapters", mp_property_chapters, CONF_TYPE_INT, 0, 0, 0, NULL }, { "angle", mp_property_angle, CONF_TYPE_INT, Modified: trunk/libmpdemux/demuxer.h ============================================================================== --- trunk/libmpdemux/demuxer.h Thu Dec 29 20:42:58 2011 (r34473) +++ trunk/libmpdemux/demuxer.h Sat Dec 31 13:20:08 2011 (r34474) @@ -263,6 +263,8 @@ typedef struct demuxer { // pointer to teletext decoder private data, if demuxer stream contains teletext void *teletext; + int num_titles; + demux_chapter_t* chapters; int num_chapters; Modified: trunk/stream/stream.h ============================================================================== --- trunk/stream/stream.h Thu Dec 29 20:42:58 2011 (r34473) +++ trunk/stream/stream.h Sat Dec 31 13:20:08 2011 (r34474) @@ -98,6 +98,7 @@ #define STREAM_CTRL_GET_NUM_ANGLES 9 #define STREAM_CTRL_GET_ANGLE 10 #define STREAM_CTRL_SET_ANGLE 11 +#define STREAM_CTRL_GET_NUM_TITLES 12 typedef enum { Modified: trunk/stream/stream_cdda.c ============================================================================== --- trunk/stream/stream_cdda.c Thu Dec 29 20:42:58 2011 (r34473) +++ trunk/stream/stream_cdda.c Sat Dec 31 13:20:08 2011 (r34474) @@ -243,6 +243,11 @@ static int get_track_by_sector(cdda_priv static int control(stream_t *stream, int cmd, void *arg) { cdda_priv* p = stream->priv; switch(cmd) { + case STREAM_CTRL_GET_NUM_TITLES: + { + *(unsigned int *)arg = p->cd->tracks; + return STREAM_OK; + } case STREAM_CTRL_GET_NUM_CHAPTERS: { int start_track = get_track_by_sector(p, p->start_sector); Modified: trunk/stream/stream_dvd.c ============================================================================== --- trunk/stream/stream_dvd.c Thu Dec 29 20:42:58 2011 (r34473) +++ trunk/stream/stream_dvd.c Sat Dec 31 13:20:08 2011 (r34474) @@ -665,6 +665,11 @@ static int control(stream_t *stream,int *((double *)arg) = (double) mp_get_titleset_length(d->vts_file, d->tt_srpt, d->cur_title-1)/1000.0; return 1; } + case STREAM_CTRL_GET_NUM_TITLES: + { + *((unsigned int *)arg) = d->vmg_file->tt_srpt->nr_of_srpts; + return 1; + } case STREAM_CTRL_GET_NUM_CHAPTERS: { int r; Modified: trunk/stream/stream_vcd.c ============================================================================== --- trunk/stream/stream_vcd.c Thu Dec 29 20:42:58 2011 (r34473) +++ trunk/stream/stream_vcd.c Sat Dec 31 13:20:08 2011 (r34474) @@ -92,6 +92,7 @@ static int seek(stream_t *s,off_t newpos static int control(stream_t *stream, int cmd, void *arg) { struct stream_priv_s *p = stream->priv; switch(cmd) { + case STREAM_CTRL_GET_NUM_TITLES: case STREAM_CTRL_GET_NUM_CHAPTERS: { mp_vcd_priv_t *vcd = vcd_read_toc(stream->fd);

1 0