Public/fhem-mirror
1
0
Fork 0
mirror of https://github.com/fhem/fhem-mirror.git synced 2025-05-04 22:19:38 +00:00
Code Issues Packages Projects Releases Wiki Activity

37_plex.pm: playAlbum and playQueue enhancements (by Risiko)

Browse Source 
git-svn-id: https://svn.fhem.de/fhem/trunk@11532 2b470e98-0d58-463d-a4d8-8e2adae1ed80
This commit is contained in:
justme-1968 2016-05-27 17:00:22 +00:00
parent d7df0ee99c
commit 4a6c45e8a4
1 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
fhem/FHEM/37_plex.pm
View File

@ -1040,6 +1040,7 @@ plex_Set($$@)
} }
$list .= 'play ' if( !$hash->{controllable} || $hash->{controllable} =~ m/\bplayPause\b/ ); $list .= 'play ' if( !$hash->{controllable} || $hash->{controllable} =~ m/\bplayPause\b/ );
$list .= 'playAlbum ' if( !$hash->{controllable} || $hash->{controllable} =~ m/\bplayqueues\b/ );
$list .= 'resume:noArg ' if( !$hash->{controllable} || $hash->{controllable} =~ m/\bplayPause\b/ ); $list .= 'resume:noArg ' if( !$hash->{controllable} || $hash->{controllable} =~ m/\bplayPause\b/ );
$list .= 'pause:noArg ' if( $hash->{controllable} && $hash->{controllable} =~ m/\bplayPause\b/ );; $list .= 'pause:noArg ' if( $hash->{controllable} && $hash->{controllable} =~ m/\bplayPause\b/ );;
$list .= 'stop:noArg ' if( $hash->{controllable} && $hash->{controllable} =~ m/\bstop\b/ );; $list .= 'stop:noArg ' if( $hash->{controllable} && $hash->{controllable} =~ m/\bstop\b/ );;
@ -1931,7 +1932,8 @@ plex_playAlbum($$$$)
#Log 1, Dumper $xml; #Log 1, Dumper $xml;
return "item not found" if( !$xml || !$xml->{librarySectionUUID} ); return "item not found" if( !$xml || !$xml->{librarySectionUUID} );
my $url = "http://$server->{address}:$server->{port}/playQueues?next=0&type=&window=200&own=1&uri=". urlEncode( "library://$xml->{librarySectionUUID}/directory$key" ); my $url = "http://$server->{address}:$server->{port}/playQueues?type=&uri=". urlEncode( "library://$xml->{librarySectionUUID}/item/$key" );
$url .= "&shuffle=0&repeat=0&includeChapters=1&includeRelated=1";
Log3 $name, 4, "$name: requesting $url"; Log3 $name, 4, "$name: requesting $url";
@ -1958,6 +1960,7 @@ plex_playAlbum($$$$)
httpversion => '1.1', httpversion => '1.1',
hash => $hash, hash => $hash,
key => 'playAlbum', key => 'playAlbum',
album => $key,
client => $client, client => $client,
server => $server, server => $server,
address => $address, address => $address,
@ -3529,8 +3532,12 @@ plex_parseHttpAnswer($$$)
$handled = 1; $handled = 1;
my $client = $param->{client}; my $client = $param->{client};
my $server = $param->{server}; my $server = $param->{server};
my $key = $xml->{playQueueID}; my $queue = $xml->{playQueueID};
plex_sendApiCmd( $hash, "http://$client->{address}:$client->{port}/player/playback/playMedia?key=&containerKey=/playQueues/$key&machineIdentifier=$server->{machineIdentifier}&address=$server->{address}&port=$server->{port}", "playback" ); my $key = $param->{album};
my $url = "http://$client->{address}:$client->{port}/player/playback/playMedia?key=$key&offset=0";
$url .= "&machineIdentifier=$server->{machineIdentifier}&protocol=http&address=$server->{address}&port=$server->{port}";
$url .= "&containerKey=/playQueues/$queue?own=1&window=200";
plex_sendApiCmd( $hash, $url, "playback" );
} elsif( $param->{key} eq 'timeline' ) { } elsif( $param->{key} eq 'timeline' ) {
$handled = 1; $handled = 1;