Merge pull request #2 from Uriziel/master

.

syncplay/constants.py

@@ -1,18 +1,21 @@
+#You might want to change these
 DEFAULT_PORT = 8999
-MPC_OPEN_MAX_WAIT_TIME = 10
-MPC_LOCK_WAIT_TIME = 0.2
 OSD_DURATION = 3000
 MPC_OSD_POSITION = 2 #Right corner, 1 for left
-MPC_RETRY_WAIT_TIME = 0.01
-MPC_MAX_RETRIES = 30
-MPC_PAUSE_TOGGLE_DELAY = 0.05
 MPLAYER_OSD_LEVEL = 1
-MPLAYER_ANSWER_REGEX = "^ANS_([a-zA-Z_]+)=(.+)$"
-MPLAYER_SLAVE_ARGS = [ '-slave', '-msglevel', 'all=1:global=4']
-UI_COMMAND_REGEX = r"^(?P<command>[^\ ]+)(?:\ (?P<parameter>.+))?"
-UI_OFFSET_REGEX = r"^(?:o|offset)\ ?(?P<sign>[/+-])?(?P<time>\d+(?:[^\d\.](?:\d+)){0,2}(?:\.(?:\d+))?)$"
-UI_SEEK_REGEX = r"^(?:s|seek)?\ ?(?P<sign>[+-])?(?P<time>\d+(?:[^\d\.](?:\d+)){0,2}(?:\.(?:\d+))?)$"
 UI_TIME_FORMAT = "[%X] "
+DEFAULT_ROOM = 'default'
+
+#Changing these might be ok
+SEEK_BOUNDARY = 1
+SLOWDOWN_RATE = 0.95
+SLOWDOWN_KICKIN_BOUNDARY = 1.5
+SLOWDOWN_RESET_BOUNDARY = 0.1
+DIFFFERENT_DURATION_BOUNDARY = 1
+PROTOCOL_TIMEOUT = 5
+RECONNECT_RETRIES = 10
+
+#Usually there's no need to adjust these
 COMMANDS_UNDO = ["u", "undo", "revert"]
 COMMANDS_LIST = ["l", "list", "users"]
 COMMANDS_PAUSE = ["p", "play", "pause"]
@@ -30,14 +33,20 @@ MPC_PATHS = [
              "C:\Program Files (x86)\Combined Community Codec Pack\MPC\mpc-hc.exe",
              "C:\Program Files\MPC HomeCinema (x64)\mpc-hc64.exe",
              ]
-RECONNECT_RETRIES = 10
-DEFAULT_ROOM = 'default'
+
+#Changing these is usually not something you're looking for
 PLAYER_ASK_DELAY = 0.1
-PROTOCOL_TIMEOUT = 5
-SEEK_BOUNDARY = 1
-SLOWDOWN_RATE = 0.95
-SLOWDOWN_KICKIN_BOUNDARY = 1.5
-SLOWDOWN_RESET_BOUNDARY = 0.1
-DIFFFERENT_DURATION_BOUNDARY = 1
 PING_MOVING_AVERAGE_WEIGHT = 0.85
+MPC_OPEN_MAX_WAIT_TIME = 10
+MPC_LOCK_WAIT_TIME = 0.2
+MPC_RETRY_WAIT_TIME = 0.01
+MPC_MAX_RETRIES = 30
+MPC_PAUSE_TOGGLE_DELAY = 0.05
+
+#These are not changes you're looking for
+MPLAYER_SLAVE_ARGS = [ '-slave', '-msglevel', 'all=1:global=4']
+MPLAYER_ANSWER_REGEX = "^ANS_([a-zA-Z_]+)=(.+)$"
+UI_COMMAND_REGEX = r"^(?P<command>[^\ ]+)(?:\ (?P<parameter>.+))?"
+UI_OFFSET_REGEX = r"^(?:o|offset)\ ?(?P<sign>[/+-])?(?P<time>\d+(?:[^\d\.](?:\d+)){0,2}(?:\.(?:\d+))?)$"
+UI_SEEK_REGEX = r"^(?:s|seek)?\ ?(?P<sign>[+-])?(?P<time>\d+(?:[^\d\.](?:\d+)){0,2}(?:\.(?:\d+))?)$"
 PARSE_TIME_REGEX = r'(:?(?:(?P<hours>\d+?)[^\d\.])?(?:(?P<minutes>\d+?))?[^\d\.])?(?P<seconds>\d+?)(?:\.(?P<miliseconds>\d+?))?$'

syncplayServer.py

@@ -1,3 +1,4 @@
+#!/usr/bin/env python
 #coding:utf8
 
 from twisted.internet import reactor