Troplo/PlexKodiConnect
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity
2385 commits 11 branches 455 tags 38 MiB
Commit graph

1993 commits

Author SHA1 Message Date
angelblue05
793bd66554 Fix crash when sleeping/waking up device 2016-07-22 17:10:35 -05:00
angelblue05
e97a3a616d Add temporary setting to disable external subs 
For direct stream
 2016-07-22 11:54:53 -05:00
tomkat83
3407d47f9c Reduce boilerplate 2016-07-22 16:55:57 +02:00
tomkat83
bc7be04fc2 Reduce boilerplate 2016-07-22 16:51:44 +02:00
tomkat83
603e4e7867 Let wrapper return 2016-07-22 16:48:48 +02:00
tomkat83
898f2e6379 Decorator CatchExceptions 2016-07-22 16:41:02 +02:00
tomkat83
5eac547633 Call xbmc __init__ methods 2016-07-22 15:54:03 +02:00
tomkat83
16dbc726f1 Improve logging 2016-07-22 15:42:37 +02:00
tomkat83
ab47ac958a Don't try too long to get window value 2016-07-22 15:33:27 +02:00
tomkat83
dd1f50efe6 Improve logging 2016-07-22 15:17:38 +02:00
tomkat83
a26526c146 Move Companion processing to companion thread 2016-07-22 15:04:42 +02:00
tomkat83
8a58c885e9 Redesign playlists 2016-07-20 18:36:31 +02:00
tomkat83
5d79bcf1c2 Prettify 2016-07-20 09:00:47 +02:00
tomkat83
1dc576965a Import traceback only on exception 2016-07-20 08:24:36 +02:00
tomkat83
92cf5bd517 Prettify 2016-07-20 08:23:25 +02:00
tomkat83
9496785f5d Fix AttributeError with Plex Companion MyHandler 2016-07-20 07:59:53 +02:00
tomkat83
ed8bf235c7 Remove logging 2016-07-19 18:30:11 +02:00
tomkat83
1f9ac4f133 Plex Companion: Compile regex only once 2016-07-19 18:23:52 +02:00
tomkat83
dec4b077d5 Code cleanup 2016-07-19 18:22:34 +02:00
tomkat83
d8a7218625 Beautify code 2016-07-19 15:08:28 +02:00
angelblue05
f89d5c96f6 Transform database locked into a settings 
Temporary settings, because it slows down the process since it's
auto-committing. Not everyone has database locked crashes. Permanent fix
is being worked on in the database branch.
 2016-07-19 02:08:35 -05:00
angelblue05
d5baf0ceed Fix typo 2016-07-18 17:56:39 -05:00
angelblue05
cfb94b7bd0 Temp fix for database being locked 2016-07-18 15:47:42 -05:00
angelblue05
02ab4abe51 Fix not saving watched status 
If delete after watched was enabled.
 2016-07-18 14:42:33 -05:00
angelblue05
77b99210c1 Add error mode to logging 2016-07-17 18:27:54 -05:00
tomkat83
8a2fdec248 Don't let PMS crash: download one item at a time 
- PMS can currently not handle concurrent connections asking for
metadata (several PKC threads)
- Might also fix #75
 2016-07-17 13:57:50 +02:00
angelblue05
da7685b03f Try to fix import strptime bug 
Clean up of downloadutils and utils.
 2016-07-16 10:02:50 -05:00
angelblue05
06d71cf00d Fix typo 2016-07-15 19:17:32 -05:00
angelblue05
8b83ae8a00 Clean up downloadUtils 2016-07-15 19:02:30 -05:00
angelblue05
213f42f4a5 Update downloadUtils requests 
Code reduction,  fix connections not being released.
 2016-07-15 18:01:59 -05:00
tomkat83
dbd5acf714 Fix TypeError for playlists 
- Fixes #74
 2016-07-15 19:11:17 +02:00
tomkat83
dd70a79423 Fix PKC not releasing connections to the PMS. Should fix memory, connection and PMS issues. Fixes #75, fixes #64 2016-07-15 19:01:06 +02:00
tomkat83
1eb90cc5e6 Hotfix: Fix ValueError for playing certain files 2016-07-13 07:24:35 +02:00
tomkat83
f0400f0119 Dont let PMS force scan the media 
- Guess the 'checkFiles=1' parameter for requesting a PMS item's
metadata forced a scan
- Maybe also fixes #73
 2016-07-12 21:36:30 +02:00
tomkat83
3e84f34acc Higher connection timeout 
- Fixes #73
 2016-07-12 21:30:39 +02:00
tomkat83
04e31986b5 Force pick first media stream for direct path sync 
- Otherwise user would need to choose media stream for every item with
several streams - cumbersome for large libraries with many such items
 2016-07-12 20:27:59 +02:00
tomkat83
a0b1adbf70 Enable stream/media selection for direct play 2016-07-12 20:16:45 +02:00
tomkat83
ba191eafc7 Improve code stability 
- NEVER use e.g. {} or [] as standard function arguments
 2016-07-12 20:03:10 +02:00
tomkat83
90e67931ff Improve detection of need to transcode 
- Fixes #70
 2016-07-12 19:57:04 +02:00
tomkat83
c0a39c5289 Code cleanup 2016-07-12 19:14:46 +02:00
angelblue05
15ac7fd0ca Merge remote-tracking branch 'refs/remotes/origin/master' into develop 2016-07-04 14:22:24 -05:00
shaun
8f0343de2e dont auto fall back to http streaming if not selected 
Dont fall back to http streaming if direct file playback is expected.
 2016-07-04 20:34:58 +10:00
angelblue05
0fee1975d4 Clean up dialog 2016-07-03 22:45:20 -05:00
angelblue05
272a955d4d Remove useless control in dialog 2016-07-03 22:26:10 -05:00
angelblue05
efdafa2831 Remove unused import 2016-07-03 22:25:09 -05:00
angelblue05
b8ca6d3119 Emby connect - login dialog 2016-07-03 22:24:39 -05:00
angelblue05
5aca32c341 Prep for emby connect 
xml, image, qrcode
 2016-07-03 04:32:06 -05:00
angelblue05
6c8a95fabb Fix errors 2016-07-02 23:41:42 -05:00
angelblue05
af85505a99 Translation spanish 2016-07-02 23:40:55 -05:00
shaun
a911249840 sync progress changes 
add (if item count greater) for sync progress dialog
always show progress for full sync
 2016-07-03 13:26:11 +10:00
kravone
df2600f579 Revert "Faster XML processing and lower memory" 2016-06-29 21:15:26 +02:00
SpootDev
9a5bd10d40 celementtree 2016-06-28 18:28:01 -05:00
angelblue05
9a98e2995e Remove profiling 2016-06-28 17:24:36 -05:00
angelblue05
c0f0a1978f Preparation for centralized queries 
To handle exceptions, etc.
 2016-06-28 17:24:12 -05:00
angelblue05
16ea2e35c3 Translation - Russian,Swedish 2016-06-28 13:03:12 -05:00
angelblue05
237cb26dc8 Translation - Dutch 2016-06-28 12:45:54 -05:00
angelblue05
269205fe97 Remove profiling 2016-06-28 01:09:36 -05:00
angelblue05
6837144ba7 Revert changes - static=true 2016-06-27 23:55:14 -05:00
tomkat83
8d9ac66cd7 Preparation for companion playlist skipping 
- Unicode issues from JSON responses
 2016-06-26 18:22:26 +02:00
tomkat83
fd1a44f15f Plex Companion: fix skipping forward and backward 
- Fixes #45
 2016-06-26 17:06:00 +02:00
tomkat83
40529938ca Cleanup playlist.py 2016-06-26 16:10:32 +02:00
tomkat83
3fb6443b2b Let user always play trailer in highest quality 2016-06-26 12:32:19 +02:00
tomkat83
c8311e465a Fix PKC playstate updates for widgets on Krypton 
- Fixes #67
 2016-06-26 11:53:26 +02:00
tomkat83
aa60baeb97 Let the user pick between several streams 
- And don't just pick the first one
 2016-06-25 17:21:47 +02:00
tomkat83
cfbc7f770c Use playing item filename and path to find ID 
- Fixes #67
- Everything else doesn 't work
 2016-06-25 16:02:40 +02:00
tomkat83
be63414893 Be smarter when trying to tell what Kodi plays 
- Fixes #67
 2016-06-25 12:25:01 +02:00
tomkat83
e70ce89c34 Fix matching by filename 2016-06-25 11:27:38 +02:00
tomkat83
5210e7c442 Be smarter when trying to tell what Kodi plays 
- Fixes #67
- Episodes may still throw a -1 for the id - useless!
 2016-06-24 21:28:30 +02:00
angelblue05
a84ba22908 Fix for music 2016-06-23 19:52:54 -05:00
angelblue05
2794789f05 Fix for channel not changing 
To be reviewed.
 2016-06-23 18:50:34 -05:00
angelblue05
da8bf3670d Fix conflicting import 2016-06-22 14:29:53 -05:00
angelblue05
b2d3b702d1 Revert incorrect modification 
Only use is for None, nothing else. "is" is not "=="
 2016-06-22 14:05:53 -05:00
angelblue05
03a1557eaf Fix typo 2016-06-21 15:26:42 -05:00
angelblue05
8423342371 Fix active listing 2016-06-20 21:23:36 -05:00
angelblue05
cb18f17dbe Fix typo 2016-06-20 21:21:24 -05:00
angelblue05
3e1aa94c78 Strings - translation 2016-06-20 20:57:29 -05:00
angelblue05
924c3a4a05 Fix arguments 2016-06-20 14:04:10 -05:00
angelblue05
48fbce2211 Fix typo 2016-06-20 13:59:55 -05:00
angelblue05
49157bbbea Fix logging typo 2016-06-20 13:58:17 -05:00
angelblue05
f47ead1ddc Fix logging 2016-06-19 23:09:07 -05:00
angelblue05
0efc37f646 String & remove like/dislike 
To review: music rating since server does not have like/dislike anymore
 2016-06-19 20:32:09 -05:00
angelblue05
313899c8e7 Fix typo 2016-06-19 20:17:10 -05:00
angelblue05
3c60eddf55 Add refresh item to context menu 2016-06-19 19:24:42 -05:00
angelblue05
a42ecfdbc2 Merge pull request #41 from delphiactual/patch-1 
Fixed: Typo in strings.xml
 2016-06-19 17:29:03 -05:00
angelblue05
f90349d6a8 Fix typo 2016-06-19 17:23:46 -05:00
delphiactual
ad6e0bb7da Fixed: Typo in strings.xml 2016-06-19 15:47:59 -06:00
angelblue05
a8fd73740c Strings 2016-06-19 16:24:34 -05:00
angelblue05
aa3a6fa17f Centralize logging 2016-06-19 13:30:54 -05:00
tomkat83
4ebde83896 Fix Watch Later TypeError 2016-06-19 18:53:45 +02:00
tomkat83
2129257f88 Fix plex.tv Watch Later ignored resume points 2016-06-19 18:30:21 +02:00
tomkat83
82c9d43fd9 Prettify 2016-06-19 17:20:45 +02:00
tomkat83
70ade15e8d Fixes to getExtraFanart. If not using PKC repository, you will have to manually update plugin.video.plexkodiconnect.movies and plugin.video.plexkodiconnect.tvshows. Fixes #62 2016-06-19 17:05:01 +02:00
tomkat83
133741b567 Allow direct paths for Plex photos 2016-06-19 16:12:56 +02:00
tomkat83
8ebb867f78 Use language codes ('spa'), not verbose 'español'. You will have to reset your Kodi DB manually to profit from this change. Fixes #61 2016-06-19 15:56:51 +02:00
tomkat83
792d4debeb Fix fanart.tv fallback to English not working 
- Fixes #63
 2016-06-19 15:34:27 +02:00
tomkat83
f3881bb415 Fix double PKC settings strings 2016-06-19 15:12:10 +02:00
tomkat83
54c32adad6 Compatibility with latest Kodi Krypton 
- Fixes #56
 2016-06-19 15:01:25 +02:00
tomkat83
c13343c62f Plex Photos! Choose "Refresh Plex playlists/nodes" to use the new feature 2016-06-19 14:58:42 +02:00
angelblue05
354877d31c Centralized Logging 2016-06-18 19:48:19 -05:00
angelblue05
14b1339179 Fix typos 2016-06-18 13:56:56 -05:00
angelblue05
55998c796f Remove old log method 2016-06-17 22:05:18 -05:00
angelblue05
5658801f72 Centralized logging 2016-06-17 22:03:28 -05:00
angelblue05
02e7c2946b Centralize path validation 
and logging
 2016-06-17 16:42:48 -05:00
angelblue05
1dac1c4f4b Fix typo 2016-06-17 14:52:53 -05:00
angelblue05
9314c4a363 Centralized Logging 2016-06-16 16:24:07 -05:00
angelblue05
e7bdfacd47 Empty show 
Prevent crash in the event RecursiveItemCount is missing. Sounds like a
server bug if it's missing from the api
 2016-06-16 14:13:38 -05:00
angelblue05
b9d40d91a6 Fix SeriesName missing 
Prevent crash from happening.
 2016-06-16 00:49:54 -05:00
angelblue05
7a0f69e014 Centralized logging 2016-06-16 00:43:36 -05:00
tomkat83
6689b265f2 Plex photos 2016-06-12 17:22:22 +02:00
tomkat83
9a5533337f Warning on first run that Kodi will restart 2016-06-12 12:56:06 +02:00
tomkat83
6d42ae7e32 Fix not download collection artwork 2016-06-08 20:34:49 +02:00
tomkat83
3e3c5ab018 Dedicated settings to download set fanart 2016-06-08 20:03:30 +02:00
tomkat83
faf95f671c Reduce movie set/collection boilerplate 
- To increase code maintainability
 2016-06-08 19:50:24 +02:00
im85288
9dbcb5e6ff set artwork 2016-06-06 21:10:58 +01:00
tomkat83
386f4ca5f0 Get rid of obsolete setting markPlayed 
- Instead, always mark played at 90%
 2016-06-05 18:55:12 +02:00
tomkat83
ced650266f Revert "New playback setting: mark item watched after x%" 
This reverts commit d6aac26652.
 2016-06-05 18:51:45 +02:00
tomkat83
d6aac26652 New playback setting: mark item watched after x% 2016-06-05 18:49:54 +02:00
tomkat83
fcf6948735 Improvements to resume points 
- Plex sometimes tells time in milliseconds instead of seconds
- Fixes #49
 2016-06-05 18:39:26 +02:00
tomkat83
7402d076b0 Revert "Fix PKC resume points set way too high" 
This reverts commit e9f7c49587.
 2016-06-05 17:57:30 +02:00
tomkat83
5d8b423bd6 Groundworks for Plex photos 2016-06-04 18:48:22 +02:00
tomkat83
031a36a0a6 Clarify that transcode settings are TARGET quality 2016-06-04 16:19:33 +02:00
tomkat83
92b60ae3ac Fix filename change recognition for episodes 
- Fixes #26
 2016-06-04 16:13:47 +02:00
tomkat83
e9f7c49587 Fix PKC resume points set way too high 
- Fixes #49
 2016-06-04 16:04:25 +02:00
tomkat83
523a2eaf61 Fix filename changes not being recognized 
- Fixes #26, finally!
 2016-06-04 14:19:55 +02:00
tomkat83
aaa6d9c4d5 Ask on first run if we have a low powered device 
And then reduce the thread number accordingly
 2016-06-02 21:33:26 +02:00
tomkat83
531957bd14 Cleanup plexgdm 2016-06-02 21:17:12 +02:00
tomkat83
7199561573 Only tell PMS we're connected to what we're playing 
- Fixes #43
 2016-06-02 21:12:56 +02:00
tomkat83
9901935b83 Background sync: don't try to process infinitely 2016-05-31 19:30:12 +02:00
tomkat83
5a11cd70d1 Improve player.py stability 2016-05-31 19:13:29 +02:00
tomkat83
a7832b5ceb Fix crash when Kodi not playing as expected 
Fixes #41
 2016-05-31 19:02:11 +02:00
tomkat83
a92146abc2 Remove emby references 2016-05-31 08:06:42 +02:00
tomkat83
5544dfd2fe Fix DTS-HD audio is not correctly identified 
- Fixes #42
- You need to reset the Kodi DB to take advantage
 2016-05-29 20:03:31 +02:00
tomkat83
6b329fbb02 Smarter, faster way to tell PMS went offline 2016-05-29 18:51:09 +02:00
tomkat83
65ac1b3f00 Fix websockets still checking SSL certificates 2016-05-29 17:56:55 +02:00
tomkat83
eea101872b Attempt to hide password on entering it 2016-05-29 17:45:19 +02:00
tomkat83
2bab8d9357 Disable SSL check if entering PMS manually 2016-05-29 17:40:15 +02:00
tomkat83
153717da68 Always log out user on user or PMS switch 2016-05-29 17:36:07 +02:00
tomkat83
8aec935478 Fix default transcoding quality / network speed 2016-05-29 17:20:14 +02:00
tomkat83
0544452c32 Fixes to switching PMS 2016-05-29 17:17:33 +02:00
tomkat83
42f24e1688 Correctly update views on server switch 2016-05-29 16:58:54 +02:00
tomkat83
e80f38c690 Initialize Kodi DBs only once 2016-05-29 16:52:38 +02:00
tomkat83
473f6fe58a More rewiring of connections 2016-05-29 16:52:00 +02:00
tomkat83
72910d79e9 Dedicated methods within initialsetup 2016-05-24 20:43:52 +02:00
tomkat83
ae34b63de9 Re-wired connection manager 2016-05-24 19:00:39 +02:00
tomkat83
67755d6a23 Improvements to PMS connection checks 2016-05-18 20:10:20 +02:00
tomkat83
04bcaafdb4 Fix direct path replacing possibly several times 
- Fixes #37
 2016-05-17 20:15:46 +02:00
tomkat83
c47fc7f25f Fix PKC not telling Kodi timing 
- Episodes should now correctly be marked as watched
 2016-05-16 21:07:17 +02:00
tomkat83
d666867219 Cleanup entrypoint 2016-05-16 19:31:28 +02:00
tomkat83
560835fd82 Move directpaths out of loop 2016-05-16 19:27:43 +02:00
croneter
d8e9ca9ffe Merge pull request #36 from mattsch/add_sets 
Quick hack to get sets working
 2016-05-16 18:22:24 +02:00
tomkat83
553dff3bbb Fix playback report and marking item played 
- Fixes #34
 2016-05-16 18:19:05 +02:00
Matthew Schick
7ac7b1db31 Quick hack to get sets working 2016-05-16 11:56:48 -04:00
tomkat83
74e87892d0 Fix player runtime and current position 2016-05-16 16:10:48 +02:00
tomkat83
ca43b19357 Revert "Fix player runtime and current position" 
This reverts commit f9b0e69237.
 2016-05-16 16:09:21 +02:00
tomkat83
f9b0e69237 Fix player runtime and current position 2016-05-16 15:59:27 +02:00
tomkat83
51548f89cf New setting: show watched movies in recently added 2016-05-15 18:26:07 +02:00
tomkat83
7b0d810202 New setting: Force transcode HEVC 2016-05-15 18:01:13 +02:00
tomkat83
422fc0dfc9 New setting: don't show already watched episodes 2016-05-15 17:24:44 +02:00
tomkat83
9786aab050 Fix UnicodeEncodeError for file paths 
- Fixes #35
 2016-05-15 16:33:53 +02:00
tomkat83
2fe457e496 Correct VideoCodec help string 2016-05-15 16:30:09 +02:00
tomkat83
cbf3638076 Merge conflicts: Force transcode 10bit videos 2016-05-15 16:25:38 +02:00
tomkat83
0bd4a79ca3 Merge conflicts: sync after screensaver deactivated 2016-05-15 16:02:19 +02:00
tomkat83
abcb438f21 Merge remote-tracking branch 'MediaBrowser/master' into develop 2016-05-15 12:33:14 +02:00
tomkat83
5bf1a5a8e0 Fix new episodes not being detected 
- Set standard safety margin to 60 seconds. Otherwise, you might get
many screen refreshes
- Fixes #23
 2016-05-12 21:46:50 +02:00
tomkat83
04c415604d Use direct file paths for on deck shows if enabled 
- Fixes #30
 2016-05-12 20:43:53 +02:00
angelblue05
417b8d3b22 Merge pull request #39 from NickSC/master 2016-05-11 01:06:28 -05:00
Nick
ffb2b11d7c screensaver sync delay increased to 5 seconds 2016-05-11 15:35:35 +10:00
tomkat83
5e6e3dd92d Use API when creating playlist listitem 2016-05-08 13:17:04 +02:00
tomkat83
a88a8a017a Never try to transcode Plex Music 2016-05-08 12:33:13 +02:00
tomkat83
387f63c4b9 Plex Companion: fix for Windows Phone Plex 
- Fixes #18
 2016-05-08 12:18:20 +02:00
tomkat83
8deba42ab8 Also show already watched recently added episodes 2016-05-07 22:21:28 +02:00
tomkat83
d01a8aafa1 Fix encoding and decoding 2016-05-07 22:17:12 +02:00
tomkat83
4575f1e482 Increase logging for background updates 
- You will need to enable debug logging in the PKC settings
 2016-05-07 17:42:19 +02:00
tomkat83
df38786638 Account for string.encode() not allowing args 
- E.g. Android TV
 2016-05-07 13:15:02 +02:00
tomkat83
8848d5167d Less logging 2016-05-07 11:58:37 +02:00
tomkat83
765fb2ddf2 Fix TypeError: encode() takes no keyword arguments 
E.g. Android TV do not accept arguments for string.encode()
 2016-05-07 11:55:35 +02:00
A69Tor
04377c5a9c Update playutils.py 
Condense videoprofiles check
 2016-05-06 19:16:07 -04:00
A69Tor
055366753a Update playutils.py 
Remove debug log line
 2016-05-06 18:57:19 -04:00
A69Tor
9d50c4f745 Update playutils.py 
Modified Hi10P to get streams and parse profiles
 2016-05-06 18:55:14 -04:00
A69Tor
db8ddc16d2 Update settings.xml 
Correct Bool for Transcode Hi10P
 2016-05-06 18:00:52 -04:00
A69Tor
7bf0912a11 Update playutils.py 
debug
 2016-05-06 16:46:30 -04:00
A69Tor
d99e7a1290 Update playutils.py 2016-05-06 16:41:37 -04:00
A69Tor
6cb056c987 Update playutils.py 
Add in videoprofile check and force transcode for Hi10P
 2016-05-06 16:24:23 -04:00
tomkat83
47409e1535 Fix UnicodeDecodeError with file paths on sync 
- Plex sometimes seems to encode in latin1 instead of utf-8. What the
heck?!?
- Fixes #20
 2016-05-06 22:16:56 +02:00
A69Tor
27f8771642 Update settings.xml 
Add Force Transcode Hi10P setting
 2016-05-06 16:05:17 -04:00
A69Tor
06c85ccc69 Update strings.xml 
Add Force Transcode Hi10P
 2016-05-06 16:04:39 -04:00
tomkat83
496aa2593a Remove Emby reference from logs 
- Fixes #24
 2016-05-06 21:09:35 +02:00
tomkat83
d8da6d0e08 Fix TypeError when trying to transcode 
- Fixes #19
 2016-05-01 10:34:54 +02:00
tomkat83
68ced3a4a1 Fix TypeError during Plex user switch 
- Fixes #19
 2016-05-01 10:28:08 +02:00
tomkat83
674f670dee Move API keys to settings file 2016-04-29 13:32:25 +02:00
tomkat83
8d5f71dd6a Cache everything, not only fanart, poster, thumb 2016-04-29 12:45:40 +02:00
tomkat83
d879a9d23c Additional artwork download from FanartTV! 2016-04-29 12:44:56 +02:00
Nick
a07f545d5a added option to perform sync when screensaver is deactivated 2016-04-29 15:48:09 +10:00
tomkat83
0d96f6bf4f New setting: Show+SxxExx to Recently Added 
- Fixes #12
 2016-04-27 10:37:24 +02:00
tomkat83
3855bb16ed Fix UnicodeEncodeError, fixes #8 2016-04-26 19:19:52 +02:00
tomkat83
d557712896 Companion reports playstate. Fixes #6, fixes #7 2016-04-26 17:21:09 +02:00
tomkat83
8b04f6175d Revert "Use Plex Companion for Playstate Reporting" 
This reverts commit f22369a14a.
 2016-04-26 17:10:11 +02:00
tomkat83
f22369a14a Use Plex Companion for Playstate Reporting 
- Should fix Unknown answer from PMS
https://192.168.178.5:32400/:/timeline?SubtitleStreamIndex=&AudioStreamIndex=1&ratingKey=4338&state=playing&time=424000&duration=8286000000
with status code 400. Message:
NOTICE: PlexKodiConnect DownloadUtils -> Bad Request

- Merge fixes to player.py
 2016-04-26 17:02:29 +02:00
tomkat83
b820953c52 Fix some merge conflicts 2016-04-26 14:41:58 +02:00
tomkat83
c7b52a1fa4 Merge conflicts: download action_type 2016-04-26 14:02:19 +02:00