diff options
author | wm4 <wm4@nowhere> | 2012-10-11 02:04:08 +0200 |
---|---|---|
committer | wm4 <wm4@nowhere> | 2012-10-12 10:14:32 +0200 |
commit | 65fc530f0c3ff02f982a0e4c74988d4a53730f04 (patch) | |
tree | c1faf4915a2c1e4e1d593b41a42891f0d547022f /libao2 | |
parent | 3d712eb56da9b9dccdef28fa1a3694c4d8fccd65 (diff) | |
download | mpv-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 'libao2')
-rw-r--r-- | libao2/ao_alsa.c | 2 | ||||
-rw-r--r-- | libao2/ao_coreaudio.c | 2 | ||||
-rw-r--r-- | libao2/ao_dsound.c | 2 | ||||
-rw-r--r-- | libao2/ao_jack.c | 6 | ||||
-rw-r--r-- | libao2/ao_openal.c | 2 | ||||
-rw-r--r-- | libao2/ao_oss.c | 2 | ||||
-rw-r--r-- | libao2/ao_portaudio.c | 2 | ||||
-rw-r--r-- | libao2/ao_pulse.c | 2 |
8 files changed, 10 insertions, 10 deletions
diff --git a/libao2/ao_alsa.c b/libao2/ao_alsa.c index ba665d9b73..e0322c70d5 100644 --- a/libao2/ao_alsa.c +++ b/libao2/ao_alsa.c @@ -269,7 +269,7 @@ static void print_help (void) { mp_tmsg (MSGT_AO, MSGL_FATAL, "\n[AO_ALSA] -ao alsa commandline help:\n"\ - "[AO_ALSA] Example: mplayer -ao alsa:device=hw=0.3\n"\ + "[AO_ALSA] Example: mpv -ao alsa:device=hw=0.3\n"\ "[AO_ALSA] Sets first card fourth hardware device.\n\n"\ "[AO_ALSA] Options:\n"\ "[AO_ALSA] noblock\n"\ diff --git a/libao2/ao_coreaudio.c b/libao2/ao_coreaudio.c index e78973ec04..e0d2d6d26c 100644 --- a/libao2/ao_coreaudio.c +++ b/libao2/ao_coreaudio.c @@ -378,7 +378,7 @@ static void print_help(void) mp_msg(MSGT_AO, MSGL_FATAL, "\n-ao coreaudio commandline help:\n" - "Example: mplayer -ao coreaudio:device_id=266\n" + "Example: mpv -ao coreaudio:device_id=266\n" " open Core Audio with output device ID 266.\n" "\nOptions:\n" " device_id\n" diff --git a/libao2/ao_dsound.c b/libao2/ao_dsound.c index a72ed32022..4ef7029c29 100644 --- a/libao2/ao_dsound.c +++ b/libao2/ao_dsound.c @@ -184,7 +184,7 @@ static void print_help(void) { mp_msg(MSGT_AO, MSGL_FATAL, "\n-ao dsound commandline help:\n" - "Example: mplayer -ao dsound:device=1\n" + "Example: mpv -ao dsound:device=1\n" " sets 1st device\n" "\nOptions:\n" " device=<device-number>\n" diff --git a/libao2/ao_jack.c b/libao2/ao_jack.c index 5a80bb34bb..b30f99a14e 100644 --- a/libao2/ao_jack.c +++ b/libao2/ao_jack.c @@ -188,8 +188,8 @@ static void print_help (void) { mp_msg (MSGT_AO, MSGL_FATAL, "\n-ao jack commandline help:\n" - "Example: mplayer -ao jack:port=myout\n" - " connects MPlayer to the jack ports named myout\n" + "Example: mpv -ao jack:port=myout\n" + " connects mpv to the jack ports named myout\n" "\nOptions:\n" " port=<port name>\n" " Connects to the given ports instead of the default physical ones\n" @@ -228,7 +228,7 @@ static int init(int rate, int channels, int format, int flags) { } if (!client_name) { client_name = malloc(40); - sprintf(client_name, "MPlayer [%d]", getpid()); + sprintf(client_name, "mpv [%d]", getpid()); } if (!autostart) open_options |= JackNoStartServer; diff --git a/libao2/ao_openal.c b/libao2/ao_openal.c index 8245f4f1d7..e5a40a769d 100644 --- a/libao2/ao_openal.c +++ b/libao2/ao_openal.c @@ -88,7 +88,7 @@ static int control(int cmd, void *arg) { static void print_help(void) { mp_msg(MSGT_AO, MSGL_FATAL, "\n-ao openal commandline help:\n" - "Example: mplayer -ao openal:device=subdevice\n" + "Example: mpv -ao openal:device=subdevice\n" "\nOptions:\n" " device=subdevice\n" " Audio device OpenAL should use. Devices can be listed\n" diff --git a/libao2/ao_oss.c b/libao2/ao_oss.c index a8d06aee00..a79361a6a8 100644 --- a/libao2/ao_oss.c +++ b/libao2/ao_oss.c @@ -403,7 +403,7 @@ ac3_retry: } free(data); if(ao_data.buffersize==0){ - mp_tmsg(MSGT_AO,MSGL_ERR,"[AO OSS]\n *** Your audio driver DOES NOT support select() ***\n Recompile MPlayer with #undef HAVE_AUDIO_SELECT in config.h !\n\n"); + mp_tmsg(MSGT_AO,MSGL_ERR,"[AO OSS]\n *** Your audio driver DOES NOT support select() ***\n Recompile mpv with #undef HAVE_AUDIO_SELECT in config.h !\n\n"); return 0; } #endif diff --git a/libao2/ao_portaudio.c b/libao2/ao_portaudio.c index 00016ac3f3..36b08f8288 100644 --- a/libao2/ao_portaudio.c +++ b/libao2/ao_portaudio.c @@ -68,7 +68,7 @@ static void print_help(void) { mp_msg(MSGT_AO, MSGL_FATAL, "\n-ao portaudio commandline help:\n" - "Example: mplayer -ao portaudio:device=subdevice\n" + "Example: mpv -ao portaudio:device=subdevice\n" "\nOptions:\n" " device=subdevice\n" " Audio device PortAudio should use. Devices can be listed\n" diff --git a/libao2/ao_pulse.c b/libao2/ao_pulse.c index b8e4f1cbdd..1d2ebc5281 100644 --- a/libao2/ao_pulse.c +++ b/libao2/ao_pulse.c @@ -32,7 +32,7 @@ #include "audio_out.h" #include "input/input.h" -#define PULSE_CLIENT_NAME "mplayer2" +#define PULSE_CLIENT_NAME "mpv" #define VOL_PA2MP(v) ((v) * 100 / PA_VOLUME_UI_MAX) #define VOL_MP2PA(v) ((v) * PA_VOLUME_UI_MAX / 100) |