path: root/input
diff options
authorwm4 <wm4@nowhere>2012-10-11 02:04:08 +0200
committerwm4 <wm4@nowhere>2012-10-12 10:14:32 +0200
commit65fc530f0c3ff02f982a0e4c74988d4a53730f04 (patch)
treec1faf4915a2c1e4e1d593b41a42891f0d547022f /input
parent3d712eb56da9b9dccdef28fa1a3694c4d8fccd65 (diff)
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 'input')
2 files changed, 2 insertions, 2 deletions
diff --git a/input/input.c b/input/input.c
index 54be75c439..1a4b66be8d 100644
--- a/input/input.c
+++ b/input/input.c
@@ -1612,7 +1612,7 @@ struct input_ctx *mp_input_init(struct input_conf *input_conf)
if (input_conf->use_lircc) {
- int fd = lircc_init("mplayer", NULL);
+ int fd = lircc_init("mpv", NULL);
if (fd >= 0)
mp_input_add_cmd_fd(ictx, fd, 1, NULL, lircc_cleanup);
diff --git a/input/lirc.c b/input/lirc.c
index 23454d6aee..fd64beb479 100644
--- a/input/lirc.c
+++ b/input/lirc.c
@@ -41,7 +41,7 @@ mp_input_lirc_init(void) {
int mode;
mp_tmsg(MSGT_LIRC,MSGL_V,"Setting up LIRC support...\n");
- if((lirc_sock=lirc_init("mplayer",0))==-1){
+ if((lirc_sock=lirc_init("mpv",0))==-1){
mp_tmsg(MSGT_LIRC,MSGL_V,"Failed to open LIRC support. You will not be able to use your remote control.\n");
return -1;