Uriziel 5dc1288fd4 Merge remote-tracking branch 'origin/controlledRooms-new' ...

Conflicts:
	syncplay/client.py
	syncplay/constants.py
	syncplay/players/mplayer.py
	syncplay/ui/gui.py

2014-11-29 18:51:27 +01:00

..

__init__.py

Experimental VLC support

2013-01-17 20:43:44 +00:00

basePlayer.py

mpv: Hopefully fix reset on regular file change bug

2014-09-26 13:40:20 +01:00

mpc.py

mpv: Hopefully fix reset on regular file change bug

2014-09-26 13:40:20 +01:00

mplayer.py

Merge remote-tracking branch 'origin/controlledRooms-new'

2014-11-29 18:51:27 +01:00

mpv.py

Split old/new mpv into separate classes + add wait timeout for new mpv

2014-11-22 22:43:40 +00:00

playerFactory.py

Applied fix: "Remove redundant parameters"

2014-07-03 00:20:31 +02:00

vlc.py

Add debug messages for VLC/mpv/Client-Server comms

2014-10-10 19:39:43 +01:00