From df633cfab682e1751ab4a121a5815b03dc1e9a24 Mon Sep 17 00:00:00 2001 From: daniel-123 Date: Tue, 25 Sep 2012 19:09:42 +0200 Subject: [PATCH 01/24] Added shebang line to make syncplayClient.py executable on Linux. --- syncplayClient.py | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/syncplayClient.py b/syncplayClient.py index 18749eb..5137cb6 100644 --- a/syncplayClient.py +++ b/syncplayClient.py @@ -1,3 +1,5 @@ +#!/usr/bin/env python + import os class Syncplay(object): @@ -10,4 +12,4 @@ class Syncplay(object): SyncplayMPC() if(__name__ == '__main__'): - Syncplay() \ No newline at end of file + Syncplay() From 5bf086b3aab064c4adb7bf7ace23425cf8c0a372 Mon Sep 17 00:00:00 2001 From: Et0h Date: Tue, 25 Sep 2012 19:34:12 +0200 Subject: [PATCH 02/24] Update READNE.md to fix typo --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 932b251..9ae7402 100644 --- a/README.md +++ b/README.md @@ -123,7 +123,7 @@ Pass the IP or hostname (and password / port if necessary) to people you want to ### Server command-line switches * `--port [port]` - Use stated port instead of the default one. -* `--isolate-room` - If specified then 'room isolation' is enabled. This means that viewers will not be able to see information about users who are in rooms other than the one they are in. This feature is reccommended for a public server, but not for a small private server. +* `--isolate-room` - If specified then 'room isolation' is enabled. This means that viewers will not be able to see information about users who are in rooms other than the one they are in. This feature is recommended for a public server, but not for a small private server. * `--password` - Restrict access to the Syncplay server to only those who use this password when they connect to the server. This feature is recommended for a private server but is not needed for a public server. By default the password is blank (i.e. there is no password restriction). ## Syncplay behaviour From 7a46debb201229991b7ae2d25168affbd2fdddc3 Mon Sep 17 00:00:00 2001 From: Et0h Date: Tue, 25 Sep 2012 19:37:45 +0200 Subject: [PATCH 03/24] Update README.md to add no-store reference --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 9ae7402..78ded47 100644 --- a/README.md +++ b/README.md @@ -143,6 +143,8 @@ The server has the ability to control the following aspects of the instance of t The client affects the following files: * Modifying .syncplay file in %APPDATA% (or $HOME on Linux version) folder to store configuration information. +Note: This behaviour can be disabled by using the `--no-store` command-line switch (see "Command-line switches", above) + ## How to report bugs You can report bugs through https://github.com/Uriziel/syncplay/issues but first please check to see if your problem has already been reported. From 15789a2808324342a45dc1e7aba9a1f8864827d2 Mon Sep 17 00:00:00 2001 From: daniel-123 Date: Tue, 25 Sep 2012 19:39:29 +0200 Subject: [PATCH 04/24] Added syncplay.desktop file for integration with Linux environments according to Desktop Entry Specification http://standards.freedesktop.org/desktop-entry-spec/latest/ --- syncplay.desktop | 13 +++++++++++++ 1 file changed, 13 insertions(+) create mode 100755 syncplay.desktop diff --git a/syncplay.desktop b/syncplay.desktop new file mode 100755 index 0000000..ce7c285 --- /dev/null +++ b/syncplay.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Encoding=UTF-8 +Name=Syncplay +Name[pl]=Syncplay +Comment=Synchronize video playback over network +Comment[pl]=Synchronizacja odtwarzania wideo przez sieć +Exec=/opt/syncplay/syncplayClient.py %u +Terminal=true +Type=Application +Icon=/opt/syncplay/icon2.ico +Categories=AudioVideo;Audio;Video;Player;Network; +MimeType=application/ogg;application/x-ogg;application/sdp;application/smil;application/x-smil;application/streamingmedia;application/x-streamingmedia;application/vnd.rn-realmedia;application/vnd.rn-realmedia-vbr;audio/aac;audio/x-aac;audio/m4a;audio/x-m4a;audio/mp1;audio/x-mp1;audio/mp2;audio/x-mp2;audio/mp3;audio/x-mp3;audio/mpeg;audio/x-mpeg;audio/mpegurl;audio/x-mpegurl;audio/mpg;audio/x-mpg;audio/rn-mpeg;audio/scpls;audio/x-scpls;audio/vnd.rn-realaudio;audio/wav;audio/x-pn-windows-pcm;audio/x-realaudio;audio/x-pn-realaudio;audio/x-ms-wma;audio/x-pls;audio/x-wav;video/mpeg;video/x-mpeg;video/x-mpeg2;video/msvideo;video/x-msvideo;video/quicktime;video/vnd.rn-realvideo;video/x-ms-afs;video/x-ms-asf;video/x-ms-wmv;video/x-ms-wmx;video/x-ms-wvxvideo;video/x-avi;video/x-fli;video/x-theora;video/x-matroska;video/3gpp;application/x-flash-video; +StartupWMClass=Syncplay From b33162650ab16e8120aafe7fde10afb669b94501 Mon Sep 17 00:00:00 2001 From: Et0h Date: Tue, 25 Sep 2012 20:34:49 +0200 Subject: [PATCH 05/24] Update README.md --- README.md | 1 + 1 file changed, 1 insertion(+) diff --git a/README.md b/README.md index 78ded47..8a25b5b 100644 --- a/README.md +++ b/README.md @@ -112,6 +112,7 @@ You can run `syncplayClient` with the following command-line switches to alter S ### Error messages and notifications * `Rewinded due to time difference` - This means that your media player ended up too far in front of at least one other viewer and has jumped back to keep you in sync. This is usually because someone's computer isn't powerful enough to play the file smoothly. +* `File you're playing is different from [user]'s` - This means that the name, length or duration of the file they are playing is different from the file you are playing. This is for information only and is not an error. ## How to use the server From 97e5460f524a54b80edc26328f19a163f77db394 Mon Sep 17 00:00:00 2001 From: Et0h Date: Tue, 25 Sep 2012 20:39:23 +0200 Subject: [PATCH 06/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 8a25b5b..0b1a0e8 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ You can run `syncplayClient` with the following command-line switches to alter S ### Error messages and notifications * `Rewinded due to time difference` - This means that your media player ended up too far in front of at least one other viewer and has jumped back to keep you in sync. This is usually because someone's computer isn't powerful enough to play the file smoothly. -* `File you're playing is different from [user]'s` - This means that the name, length or duration of the file they are playing is different from the file you are playing. This is for information only and is not an error. +* `File you're playing is different from [user]'s` - This means that the name, length and/or duration of the file they are playing is different from the file you are playing. This is for information only and is not an error. ## How to use the server From e840376d53c235bd24b345e8a0b531d81f629502 Mon Sep 17 00:00:00 2001 From: Et0h Date: Tue, 25 Sep 2012 20:51:48 +0200 Subject: [PATCH 07/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0b1a0e8..1f5a10e 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ You can run `syncplayClient` with the following command-line switches to alter S ### Error messages and notifications * `Rewinded due to time difference` - This means that your media player ended up too far in front of at least one other viewer and has jumped back to keep you in sync. This is usually because someone's computer isn't powerful enough to play the file smoothly. -* `File you're playing is different from [user]'s` - This means that the name, length and/or duration of the file they are playing is different from the file you are playing. This is for information only and is not an error. +* `File you're playing is different from [user]'s` - This means that the name, length and/or duration of the file that the user is playing is different from the file that you are playing. This is for information only and is not an error. ## How to use the server From ff7dbe4f84605469ba537cf39ea17ff5ae3ddb52 Mon Sep 17 00:00:00 2001 From: Et0h Date: Tue, 25 Sep 2012 20:52:45 +0200 Subject: [PATCH 08/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 1f5a10e..b6ea4ed 100644 --- a/README.md +++ b/README.md @@ -109,7 +109,7 @@ You can run `syncplayClient` with the following command-line switches to alter S * `[file]` - File to play upon start * `--` - used as a last argument for syncplayClient, used to prepend arguments that are meant to be passed to player -### Error messages and notifications +### Notification messages * `Rewinded due to time difference` - This means that your media player ended up too far in front of at least one other viewer and has jumped back to keep you in sync. This is usually because someone's computer isn't powerful enough to play the file smoothly. * `File you're playing is different from [user]'s` - This means that the name, length and/or duration of the file that the user is playing is different from the file that you are playing. This is for information only and is not an error. From 30139f0e72bb2c27a32caa0ece54a20573dd4116 Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 01:37:39 +0200 Subject: [PATCH 09/24] Update README.md --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index b6ea4ed..8d59893 100644 --- a/README.md +++ b/README.md @@ -112,7 +112,7 @@ You can run `syncplayClient` with the following command-line switches to alter S ### Notification messages * `Rewinded due to time difference` - This means that your media player ended up too far in front of at least one other viewer and has jumped back to keep you in sync. This is usually because someone's computer isn't powerful enough to play the file smoothly. -* `File you're playing is different from [user]'s` - This means that the name, length and/or duration of the file that the user is playing is different from the file that you are playing. This is for information only and is not an error. +* `File you're playing is different from [user]'s` - This means that the filename, length and/or duration of the file that the user is playing is different from the file that you are playing. This is for information only and is not an error. ## How to use the server @@ -125,7 +125,7 @@ Pass the IP or hostname (and password / port if necessary) to people you want to * `--port [port]` - Use stated port instead of the default one. * `--isolate-room` - If specified then 'room isolation' is enabled. This means that viewers will not be able to see information about users who are in rooms other than the one they are in. This feature is recommended for a public server, but not for a small private server. -* `--password` - Restrict access to the Syncplay server to only those who use this password when they connect to the server. This feature is recommended for a private server but is not needed for a public server. By default the password is blank (i.e. there is no password restriction). +* `--password [password]` - Restrict access to the Syncplay server to only those who use this password when they connect to the server. This feature is recommended for a private server but is not needed for a public server. By default the password is blank (i.e. there is no password restriction). ## Syncplay behaviour The following information is sent from the client to the server: From a388a22d1820bc0c200020f209ae38531d4f0bce Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 12:07:36 +0200 Subject: [PATCH 10/24] Update README.md - python to Python --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 8d59893..b0dec76 100644 --- a/README.md +++ b/README.md @@ -20,14 +20,14 @@ Frozen Windows executables are available on the download page - https://github.c ### Python scripts (for those not using the frozen executable package) -If you are not using the frozen executable package then you will need the following to run python scripts: +If you are not using the frozen executable package then you will need the following to run Python scripts: * `pygtk` >= `2.0.0` (unless started with `--no-gui`) * `argparse` >= `1.1` * `pywin32` >= `r217` (MPC-HC, Windows only) * `twisted` >= `12.1.0` -If you are using the frozen executable package available from the download page then you will not need to be able to run python scripts. +If you are using the frozen executable package available from the download page then you will not need to be able to run Python scripts. ## Supported players ### mplayer2 on Linux From 07a5bafa2f1ba1bdb60e1b24b6655f2497d6ac90 Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 12:26:34 +0200 Subject: [PATCH 11/24] Update README.md: Move/improve instructions --- README.md | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/README.md b/README.md index b0dec76..54a495b 100644 --- a/README.md +++ b/README.md @@ -44,6 +44,22 @@ On Windows simply running `syncplayClient.exe` opens a Syncplay command-line win ## Using Syncplay +### Instructions on how to use Syncplay for the first time + +1. Ensure that you have the latest version of MPC-HC on Windows or mplayer2 on Linux (see "Requirements", above). + +2. Download Syncplay from https://github.com/Uriziel/syncplay/downloads and extract to a folder of your choosing. + +3. If you are running your own server then open `syncplayServer` (see "How to use the server", below). + +4. Open `syncplayClient` (or open the media file you wish to play with `syncplayClient`, e.g. using "Open with"). + +5. Enter configuration settings (see "Configuration window", below). Ensure that you are on the same server and room as your fellow viewers. + +6. If you don't have the file you want to play open then open it from within your media player. + +7. Playing, pausing and seeking should now be synchronised with everyone else in the same 'room'. + ### Opening a media file with Syncplay If you open a file with `syncplayClient` then it will automatically open Syncplay and load the file through MPC-HC on Windows and mplayer on Linux. @@ -78,22 +94,6 @@ Within the Syncplay command-line you can enter the following commands (and then * `r` - Revert last seek. Seeks to where you were before the most recent seek. * `p` - Toggle play/pause. -### Instructions on how to use Syncplay for the first time - -1. Ensure that you have the latest version of MPC-HC on Windows or mplayer2 on Linux. - -2. Download Syncplay from https://github.com/Uriziel/syncplay/downloads and extract to a folder of your choosing. - -3. If you are running your own server then open `syncplayServer` (see "How to use the server", below). - -4. Open `syncplayClient` (or open the media file you wish to play with `syncplayClient`, e.g. using "Open with"). - -5. Enter configuration settings (see "Configuration window", above). Ensure that you are on the same server and room as your fellow viewers. - -6. If you don't have the file you want to play open then open it from within your media player. - -7. Playing, pausing and seeking should now be synchronised with everyone else in the same 'room'. - ### Command-line switches You can run `syncplayClient` with the following command-line switches to alter Syncplay settings or behaviour: From e078a7dd0398c7babc4ffbcfd3c905b35c912310 Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 12:41:59 +0200 Subject: [PATCH 12/24] Update README.md - Instructions for Windows only --- README.md | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/README.md b/README.md index 54a495b..51bff48 100644 --- a/README.md +++ b/README.md @@ -44,15 +44,15 @@ On Windows simply running `syncplayClient.exe` opens a Syncplay command-line win ## Using Syncplay -### Instructions on how to use Syncplay for the first time +### Getting started with Syncplay on Windows -1. Ensure that you have the latest version of MPC-HC on Windows or mplayer2 on Linux (see "Requirements", above). +1. Ensure that you have the latest version of `Media Player Classic - Home Cinema (MPC-HC)` installed. The most recent stable build is `1.6.3`. -2. Download Syncplay from https://github.com/Uriziel/syncplay/downloads and extract to a folder of your choosing. +2. Download the Syncplay frozen executable package from https://github.com/Uriziel/syncplay/downloads and extract to a folder of your choosing. 3. If you are running your own server then open `syncplayServer` (see "How to use the server", below). -4. Open `syncplayClient` (or open the media file you wish to play with `syncplayClient`, e.g. using "Open with"). +4. Open `syncplayClient.exe` (or open the media file you wish to play with `syncplayClient.exe`, e.g. using "Open with"). 5. Enter configuration settings (see "Configuration window", below). Ensure that you are on the same server and room as your fellow viewers. From ed74a7ba7aaaa30a1eb607a23c2bbecfb97174ba Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 12:43:37 +0200 Subject: [PATCH 13/24] Update README.md - Avoiding wordwrap --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 51bff48..4c370f5 100644 --- a/README.md +++ b/README.md @@ -46,9 +46,9 @@ On Windows simply running `syncplayClient.exe` opens a Syncplay command-line win ### Getting started with Syncplay on Windows -1. Ensure that you have the latest version of `Media Player Classic - Home Cinema (MPC-HC)` installed. The most recent stable build is `1.6.3`. +1. Ensure that you have the latest version of `Media Player Classic - Home Cinema (MPC-HC)` installed. The latest stable build is `1.6.3`. -2. Download the Syncplay frozen executable package from https://github.com/Uriziel/syncplay/downloads and extract to a folder of your choosing. +2. Download Syncplay frozen executable package from https://github.com/Uriziel/syncplay/downloads and extract to a folder of your choosing. 3. If you are running your own server then open `syncplayServer` (see "How to use the server", below). From 8d4c260d366ac63e777fcbba6131359e0c6d2a3d Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 12:46:25 +0200 Subject: [PATCH 14/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4c370f5..e42812d 100644 --- a/README.md +++ b/README.md @@ -50,7 +50,7 @@ On Windows simply running `syncplayClient.exe` opens a Syncplay command-line win 2. Download Syncplay frozen executable package from https://github.com/Uriziel/syncplay/downloads and extract to a folder of your choosing. -3. If you are running your own server then open `syncplayServer` (see "How to use the server", below). +3. If you are running your own server then open `syncplayServer.exe` (see "How to use the server", below). 4. Open `syncplayClient.exe` (or open the media file you wish to play with `syncplayClient.exe`, e.g. using "Open with"). From 3384ad7142084ca989d57e760792e862f7ac75ca Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 12:50:03 +0200 Subject: [PATCH 15/24] Update README.md --- README.md | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/README.md b/README.md index e42812d..452aa8d 100644 --- a/README.md +++ b/README.md @@ -1,11 +1,11 @@ -# Syncplay +# MPC-HCy Solution to synchronize video playback across multiple instances of mplayer2 and/or Media Player Classic (MPC-HC) over the Internet. ## What does it do Syncplay synchronises the position and play state of multiple media players so that the viewers can watch the same thing at the same time without video streaming. -When one person pauses playback, the media player is paused for all users who are connected to the same server and are in the same 'room' (viewing session). +When one person pauses playback, the media player is paused for all users who are connected to the same server and are in the same 'room' MPC-HC. When one person seeks, all players seek to the same position. When a new person joins they will be synchronised with their fellow viewers. ## What it doesn't do @@ -15,7 +15,7 @@ Syncplay does not use video streaming or file sharing so each user must have the ## Requirements Frozen Windows executables are available on the download page - https://github.com/Uriziel/syncplay/downloads -* On Windows: `Media Player Classic - Home Cinema (MPC-HC)` >= `1.6.3`. +* On Windows: `Media Player Classic - Home Cinema (M MPC-HC. * On Linux: `mplayer2`. `MPlayer` >= `1.1` should be compatible, but is not supported. ### Python scripts (for those not using the frozen executable package) @@ -56,9 +56,9 @@ On Windows simply running `syncplayClient.exe` opens a Syncplay command-line win 5. Enter configuration settings (see "Configuration window", below). Ensure that you are on the same server and room as your fellow viewers. -6. If you don't have the file you want to play open then open it from within your media player. +6. If you don't have the file you want to play open then open it from within the MPC-HC instance initiated by Syncplay. -7. Playing, pausing and seeking should now be synchronised with everyone else in the same 'room'. +7. Playing, pausing and seeking from within the MPC-HC instance initiated by Syncplay should now be synchronised with everyone else in the same 'room'. ### Opening a media file with Syncplay @@ -130,14 +130,14 @@ Pass the IP or hostname (and password / port if necessary) to people you want to ## Syncplay behaviour The following information is sent from the client to the server: * Public IP address of client and other necessary routing information (as per TCP/IP standards). -* Media position, play state, and any seek/pause/unpause commands (associated with the instance of the media player created by Syncplay). -* Size, length, and optionally filename of currently open media (associated with the instance of the media player created by Syncplay). +* Media position, play state, and any seek/pause/unpause commands (associated with the instance of the media player initiated by Syncplay). +* Size, length, and optionally filename of currently open media (associated with the instance of the media player initiated by Syncplay). * Syncplay version, username, server password and current 'room'. * Ping responses to assess latency. Note: The current official build of the Syncplay server does not store any of this information. However, some of the information (not the IP address) is passed on to other users connected to the server (or just to those in the same room if 'isolation' mode is enabled). -The server has the ability to control the following aspects of the instance of the media player created by Syncplay: +The server has the ability to control the following aspects of the instance of the media player initiated by Syncplay: * Current position (seek commands). * Current play state (pause and unpause commands). From 7e35ab88efd41ea6598f50653fbd2f3c69a7fb47 Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 12:52:20 +0200 Subject: [PATCH 16/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 452aa8d..923ba5d 100644 --- a/README.md +++ b/README.md @@ -58,7 +58,7 @@ On Windows simply running `syncplayClient.exe` opens a Syncplay command-line win 6. If you don't have the file you want to play open then open it from within the MPC-HC instance initiated by Syncplay. -7. Playing, pausing and seeking from within the MPC-HC instance initiated by Syncplay should now be synchronised with everyone else in the same 'room'. +7. Playing, pausing and seeking from within the MPC-HC instance should now be synchronised with everyone else in the same 'room'. ### Opening a media file with Syncplay From 7a77497f7e39def95ac3b5ce5c43b115c580b103 Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 12:52:39 +0200 Subject: [PATCH 17/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 923ba5d..8c6a035 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,4 @@ -# MPC-HCy +# Syncplay Solution to synchronize video playback across multiple instances of mplayer2 and/or Media Player Classic (MPC-HC) over the Internet. From c518dfb3fc875bbbe5acaf95031db13e67b45ab1 Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 12:54:57 +0200 Subject: [PATCH 18/24] Update README.md --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index 8c6a035..93e4f23 100644 --- a/README.md +++ b/README.md @@ -60,6 +60,10 @@ On Windows simply running `syncplayClient.exe` opens a Syncplay command-line win 7. Playing, pausing and seeking from within the MPC-HC instance should now be synchronised with everyone else in the same 'room'. +### Getting started with Syncplay on Linux + +* [Instructions not written yet. Blame JAXA.] + ### Opening a media file with Syncplay If you open a file with `syncplayClient` then it will automatically open Syncplay and load the file through MPC-HC on Windows and mplayer on Linux. From 88d3dfa6e4570052c5be52c1319bc0f423d36aba Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 12:58:04 +0200 Subject: [PATCH 19/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 93e4f23..80eb30d 100644 --- a/README.md +++ b/README.md @@ -62,7 +62,7 @@ On Windows simply running `syncplayClient.exe` opens a Syncplay command-line win ### Getting started with Syncplay on Linux -* [Instructions not written yet. Blame JAXA.] +* [Instructions not written yet.] ### Opening a media file with Syncplay From 17b59a8b11e07bfa2731858205cce4d79f929b5e Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 15:03:30 +0200 Subject: [PATCH 20/24] Update README.md - Shortened to be on one line --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 80eb30d..4a11ee3 100644 --- a/README.md +++ b/README.md @@ -66,7 +66,7 @@ On Windows simply running `syncplayClient.exe` opens a Syncplay command-line win ### Opening a media file with Syncplay -If you open a file with `syncplayClient` then it will automatically open Syncplay and load the file through MPC-HC on Windows and mplayer on Linux. +Opening a file with `syncplayClient` will automatically run Syncplay and load the file through MPC-HC on Windows or mplayer on Linux. ### Configuration window The configuration window allows for various settings to be configured prior to Syncplay starting. From 087e0ee48061b143135c9570707124523682a813 Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 15:21:02 +0200 Subject: [PATCH 21/24] Update README.md - Re-word what Syncplay does --- README.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/README.md b/README.md index 4a11ee3..c9e1b48 100644 --- a/README.md +++ b/README.md @@ -4,9 +4,9 @@ Solution to synchronize video playback across multiple instances of mplayer2 and ## What does it do -Syncplay synchronises the position and play state of multiple media players so that the viewers can watch the same thing at the same time without video streaming. -When one person pauses playback, the media player is paused for all users who are connected to the same server and are in the same 'room' MPC-HC. -When one person seeks, all players seek to the same position. When a new person joins they will be synchronised with their fellow viewers. +Syncplay synchronises the position and play state of multiple media players so that the viewers can watch the same thing at the same time. +This means that when one person pauses/unpauses playback or seeks (jumps position) within their media player then this will be replicated across all media players connected to the same server and in the same 'room' (viewing session). +When a new person joins they will also be synchronised. ## What it doesn't do From a7cae576556870337735a036eeb166849154f31b Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 15:31:29 +0200 Subject: [PATCH 22/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index c9e1b48..f7a3965 100644 --- a/README.md +++ b/README.md @@ -15,7 +15,7 @@ Syncplay does not use video streaming or file sharing so each user must have the ## Requirements Frozen Windows executables are available on the download page - https://github.com/Uriziel/syncplay/downloads -* On Windows: `Media Player Classic - Home Cinema (M MPC-HC. +* On Windows: `Media Player Classic - Home Cinema (MPC-HC)` >= `1.6.3`. * On Linux: `mplayer2`. `MPlayer` >= `1.1` should be compatible, but is not supported. ### Python scripts (for those not using the frozen executable package) From 2bf9e9f1b147ae997aabb342a396eb766daf0ffa Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 15:39:33 +0200 Subject: [PATCH 23/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index f7a3965..eb32c5d 100644 --- a/README.md +++ b/README.md @@ -92,7 +92,7 @@ Pressing "Save" will save the settings and continue Syncplay start-up. Within the Syncplay command-line you can enter the following commands (and then press enter) to access features: * `help` - Displays list of commands and other information. -* `room [room]` - Leaves current room and joins specified room. You are only synchronised with others in the same room on the same server. If no room is specified then it will use the filename of the currently playing file, or alternatively will join the default room if no file is playing. +* `room [room]` - Leaves current room and joins specified room. You are only synchronised with others in the same room on the same server. If no room is specified then this command will use the filename of the currently open file, or alternatively will join the room `default`. * `s [time]` - Seek (jump) to specified time. Can be `seconds`, `minutes:seconds` or `hours:minutes:seconds`. * `s+ [time]` - Jumps [time] forward. Can be `seconds`, `minutes:seconds` or `hours:minutes:seconds`. * `r` - Revert last seek. Seeks to where you were before the most recent seek. From 1774eead16443583ed7d3115c7e3c8ff74b2bf88 Mon Sep 17 00:00:00 2001 From: Et0h Date: Wed, 26 Sep 2012 16:35:58 +0200 Subject: [PATCH 24/24] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index eb32c5d..971c074 100644 --- a/README.md +++ b/README.md @@ -103,7 +103,7 @@ Within the Syncplay command-line you can enter the following commands (and then You can run `syncplayClient` with the following command-line switches to alter Syncplay settings or behaviour: * `--no-gui` - Do not display graphical user interface (GUI) -* `--host [address]` - Specify address of server to connect to (can be address:port) +* `--host [address]` - Specify address of server to connect to (can be `address:port`) * `--name [name]` / `-n [name]` - Specify username to use * `--debug` / `-d` - Enable debug mode * `--force-gui-prompt` / `-g` - Force the configuration window to appear when Syncplay starts