From 65fc530f0c3ff02f982a0e4c74988d4a53730f04 Mon Sep 17 00:00:00 2001 From: wm4 Date: Thu, 11 Oct 2012 02:04:08 +0200 Subject: 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.) --- osdep/cocoa_events.m | 2 +- osdep/macosx_finder_args.m | 2 +- osdep/mplayer.exe.manifest | 4 ++-- osdep/mplayer.rc | 12 ++++++------ 4 files changed, 10 insertions(+), 10 deletions(-) (limited to 'osdep') diff --git a/osdep/cocoa_events.m b/osdep/cocoa_events.m index ba09c13cad..e6d941d19b 100644 --- a/osdep/cocoa_events.m +++ b/osdep/cocoa_events.m @@ -106,7 +106,7 @@ void cocoa_events_init(struct input_ctx *ictx, *p = (struct priv){ .is_runloop_polling = NO, .read_all_fd_events = read_all_fd_events, - .select_queue = dispatch_queue_create("org.mplayer2.select_queue", + .select_queue = dispatch_queue_create("org.mpv.select_queue", NULL), }; } diff --git a/osdep/macosx_finder_args.m b/osdep/macosx_finder_args.m index 56d314c100..a3eae773fd 100644 --- a/osdep/macosx_finder_args.m +++ b/osdep/macosx_finder_args.m @@ -81,7 +81,7 @@ bool macosx_finder_args(m_config_t *config, struct playlist *pl_files, int argc, char **argv) { if (argc==1 && psn_matches_current_process(argv[0])) { - macosx_redirect_output_to_logfile("mplayer2"); + macosx_redirect_output_to_logfile("mpv"); m_config_set_option0(config, "quiet", NULL); macosx_wait_fileopen_events(); } diff --git a/osdep/mplayer.exe.manifest b/osdep/mplayer.exe.manifest index 7a0102dc3f..c924377c4b 100644 --- a/osdep/mplayer.exe.manifest +++ b/osdep/mplayer.exe.manifest @@ -3,10 +3,10 @@ - MPlayer - The Movie Player + mpv - The Movie Player diff --git a/osdep/mplayer.rc b/osdep/mplayer.rc index fe70aa871f..ec04346f9d 100644 --- a/osdep/mplayer.rc +++ b/osdep/mplayer.rc @@ -31,14 +31,14 @@ FILETYPE VFT_APP { BLOCK "000004b0" // LANG_NEUTRAL,UNICODE_CP { - VALUE "Comments","mplayer2 is distributed under the terms of the GNU General Public License Version 3. Source code is available at http://www.mplayer2.org\000" + VALUE "Comments","mpv is distributed under the terms of the GNU General Public License Version 3.\000" VALUE "CompanyName", "\000" - VALUE "FileDescription", "mplayer2 - Movie Player\000" + VALUE "FileDescription", "mpv - Movie Player\000" VALUE "FileVersion",VERSION - VALUE "LegalCopyright", " (C) 2000-2012 MPlayer Team\000" + VALUE "LegalCopyright", " (C) 2000-2012 MPlayer Team and others\000" //VALUE "LegalTrademarks"," \000"; - VALUE "OriginalFilename", "mplayer.exe\000" - VALUE "ProductName", "mplayer2 - The Movie Player\000" + VALUE "OriginalFilename", "mpv.exe\000" + VALUE "ProductName", "mpv - The Movie Player\000" VALUE "ProductVersion",VERSION //VALUE "SpecialBuild","\000" } @@ -52,4 +52,4 @@ FILETYPE VFT_APP IDI_ICON1 ICON DISCARDABLE "etc/mplayer.ico" // for some reason RT_MANIFEST does not work -1 24 "mplayer.exe.manifest" +1 24 "mpv.exe.manifest" -- cgit v1.2.3