summaryrefslogtreecommitdiffstats
path: root/libvo
diff options
context:
space:
mode:
authorwm4 <wm4@nowhere>2012-10-11 02:04:08 +0200
committerwm4 <wm4@nowhere>2012-10-12 10:14:32 +0200
commit65fc530f0c3ff02f982a0e4c74988d4a53730f04 (patch)
treec1faf4915a2c1e4e1d593b41a42891f0d547022f /libvo
parent3d712eb56da9b9dccdef28fa1a3694c4d8fccd65 (diff)
downloadmpv-65fc530f0c3ff02f982a0e4c74988d4a53730f04.tar.bz2
mpv-65fc530f0c3ff02f982a0e4c74988d4a53730f04.tar.xz
Rename to "mpv"
This changes the name of this project to mpv. Most user-visible mentions of "MPlayer" and "mplayer" are changed to "mpv". The binary name and the default config file location are changed as well. The new default config file location is: ~/.mpv/ Remove etc/mplayer.desktop. Apparently this was for the MPlayer GUI, which has been removed from mplayer2 ages ago. We don't have a logo, and the MS Windows resource files sort-of require one, so leave etc/mplayer.ico/.xpm as-is. Remove the debian and rpm packaging scripts. These contained outdated dependencies and likely were more harmful than useful. (Patches which add working and well-tested packaging are welcome.)
Diffstat (limited to 'libvo')
-rw-r--r--libvo/vo_caca.c2
-rw-r--r--libvo/vo_opengl.c6
-rw-r--r--libvo/vo_opengl_old.c2
-rw-r--r--libvo/vo_xv.c4
-rw-r--r--libvo/w32_common.c2
-rw-r--r--libvo/x11_common.c10
6 files changed, 13 insertions, 13 deletions
diff --git a/libvo/vo_caca.c b/libvo/vo_caca.c
index 2dfaa2a90f..caf84c6e5f 100644
--- a/libvo/vo_caca.c
+++ b/libvo/vo_caca.c
@@ -351,7 +351,7 @@ static int preinit(struct vo *vo, const char *arg)
return ENOSYS;
}
- caca_set_display_title(display, "MPlayer");
+ caca_set_display_title(display, "mpv");
return 0;
}
diff --git a/libvo/vo_opengl.c b/libvo/vo_opengl.c
index a9bd5f67e8..f5c04c03d8 100644
--- a/libvo/vo_opengl.c
+++ b/libvo/vo_opengl.c
@@ -2045,7 +2045,7 @@ static struct bstr load_file(struct gl_priv *p, void *talloc_ctx,
return res;
}
-#define LUT3D_CACHE_HEADER "mplayer2 3dlut cache 1.0\n"
+#define LUT3D_CACHE_HEADER "mpv 3dlut cache 1.0\n"
static bool load_icc(struct gl_priv *p, const char *icc_file,
const char *icc_cache, int icc_intent,
@@ -2482,7 +2482,7 @@ const struct vo_driver video_out_opengl_hq = {
static const char help_text[] =
"\n--vo=opengl command line help:\n"
-"Example: mplayer --vo=opengl:scale-sep:lscale=lanczos2\n"
+"Example: mpv --vo=opengl:scale-sep:lscale=lanczos2\n"
"\nOptions:\n"
" lscale=<filter>\n"
" Set the scaling filter. Possible choices:\n"
@@ -2521,7 +2521,7 @@ static const char help_text[] =
" sparodic and temporary image corruption.\n"
" dither-depth=<n>\n"
" Positive non-zero values select the target bit depth.\n"
-" -1: Disable any dithering done by mplayer.\n"
+" -1: Disable any dithering done by mpv.\n"
" 0: Automatic selection. If output bit depth can't be detected,\n"
" 8 bits per component are assumed.\n"
" 8: Dither to 8 bit output.\n"
diff --git a/libvo/vo_opengl_old.c b/libvo/vo_opengl_old.c
index e8cdd47172..d3a9c0e170 100644
--- a/libvo/vo_opengl_old.c
+++ b/libvo/vo_opengl_old.c
@@ -1231,7 +1231,7 @@ static int preinit(struct vo *vo, const char *arg)
if (subopt_parse(arg, subopts) != 0) {
mp_msg(MSGT_VO, MSGL_FATAL,
"\n-vo opengl_old command line help:\n"
- "Example: mplayer -vo opengl_old:slice-height=4\n"
+ "Example: mpv -vo opengl_old:slice-height=4\n"
"\nOptions:\n"
" nomanyfmts\n"
" Disable extended color formats for OpenGL 1.2 and later\n"
diff --git a/libvo/vo_xv.c b/libvo/vo_xv.c
index 65581dac35..42ddde890a 100644
--- a/libvo/vo_xv.c
+++ b/libvo/vo_xv.c
@@ -689,13 +689,13 @@ static int preinit(struct vo *vo, const char *arg)
mp_tmsg(MSGT_VO, MSGL_ERR,
"[VO_XV] Could not find free Xvideo port - maybe another process is already\n"\
"[VO_XV] using it. Close all video applications, and try again. If that does\n"\
- "[VO_XV] not help, see 'mplayer -vo help' for other (non-xv) video out drivers.\n");
+ "[VO_XV] not help, see 'mpv -vo help' for other (non-xv) video out drivers.\n");
else
mp_tmsg(MSGT_VO, MSGL_ERR,
"[VO_XV] It seems there is no Xvideo support for your video card available.\n"\
"[VO_XV] Run 'xvinfo' to verify its Xv support and read\n"\
"[VO_XV] DOCS/HTML/en/video.html#xv!\n"\
- "[VO_XV] See 'mplayer -vo help' for other (non-xv) video out drivers.\n"\
+ "[VO_XV] See 'mpv -vo help' for other (non-xv) video out drivers.\n"\
"[VO_XV] Try -vo x11.\n");
goto error;
}
diff --git a/libvo/w32_common.c b/libvo/w32_common.c
index ebe17bd154..6136730fbd 100644
--- a/libvo/w32_common.c
+++ b/libvo/w32_common.c
@@ -35,7 +35,7 @@
#define WIN_ID_TO_HWND(x) ((HWND)(uint32_t)(x))
-static const wchar_t classname[] = L"mplayer2";
+static const wchar_t classname[] = L"mpv";
static const struct mp_keymap vk_map[] = {
// special keys
diff --git a/libvo/x11_common.c b/libvo/x11_common.c
index 39c876ce3e..06ffcaef54 100644
--- a/libvo/x11_common.c
+++ b/libvo/x11_common.c
@@ -718,7 +718,7 @@ void vo_x11_classhint(struct vo *vo, Window window, const char *name)
pid_t pid = getpid();
wmClass.res_name = opts->vo_winname ? opts->vo_winname : (char *)name;
- wmClass.res_class = "mplayer2";
+ wmClass.res_class = "mpv";
XSetClassHint(x11->display, window, &wmClass);
XChangeProperty(x11->display, window, x11->XA_NET_WM_PID, XA_CARDINAL,
32, PropModeReplace, (unsigned char *) &pid, 1);
@@ -1633,7 +1633,7 @@ void vo_x11_selectinput_witherr(Display * display, Window w,
if (selectinput_err)
{
mp_msg(MSGT_VO, MSGL_ERR,
- "X11 error: MPlayer discards mouse control (reconfiguring)\n");
+ "X11 error: mpv discards mouse control (reconfiguring)\n");
XSelectInput(display, w,
event_mask &
(~
@@ -2163,20 +2163,20 @@ static void vo_xv_print_ck_info(struct vo_x11_state *x11)
if ( x11->xv_ck_info.method == CK_METHOD_AUTOPAINT )
{
mp_msg( MSGT_VO, MSGL_V,
- "Ignoring colorkey from MPlayer (0x%06lx).\n",
+ "Ignoring colorkey from mpv (0x%06lx).\n",
x11->xv_colorkey );
}
else
{
mp_msg( MSGT_VO, MSGL_V,
- "Using colorkey from MPlayer (0x%06lx)."
+ "Using colorkey from mpv (0x%06lx)."
" Use -colorkey to change.\n",
x11->xv_colorkey );
}
break;
case CK_SRC_SET:
mp_msg( MSGT_VO, MSGL_V,
- "Setting and using colorkey from MPlayer (0x%06lx)."
+ "Setting and using colorkey from mpv (0x%06lx)."
" Use -colorkey to change.\n",
x11->xv_colorkey );
break;