Request 2083 (accepted)

Overview

Request 2083 (accepted)

Update to 0.4.1.
Waiting for python-notify2 to be available.

Created by Antoine over 9 years ago
In state accepted
Package maintainer: Antoine

Submit pulseaudio-dlna

Submit package home:Antoin...:Multimedia / pulseaudio-dlna to package Multimedia / pulseaudio-dlna

pulseaudio-dlna.changes Changed

@@ -1,4 +1,36 @@
 -------------------------------------------------------------------
+Wed Jul 29 19:00:12 UTC 2015 - antoine.belvire@laposte.net
+
+- Update to 0.4.1:
+  * Fix Makefile for Launchpad
+- Changes introduced in 0.4.0:
+  * Add the --fake-http10-content-length option
+  * The application can now run as root
+  * Catch pulseaudio exceptions for streams, sinks and modules when
+    those are gone
+  * Fix a bug where a missing ssdp header field made the application
+    crash
+  * New devices are added now during runtime (thanks to coder-hugo)
+  * Rewrite of the streaming server
+  * UPnP devices can now request their audio format based on their
+    capabilities
+  * Add AAC encoder
+  * If a device stops playing, the streams currently playing on the
+    corresponding sink are switched back to the default sink
+  * If a device fails to start playing, streams currently playing
+    on the corresponding sink are switched back to the default sink
+  * Add Chromecast support (new dependency: python-protobuf)
+  * Fix a bug where the application crashed when there was no
+    suitable encoder found
+  * Add the --bit-rate option
+  * Add additional headers for DLNA devices
+  * Add switch back mode also for sinks, not just for streams (new
+    dependency: python-notify2)
+  * Add better logging
+  * Validate encoders for installed dependencies
+- Clean spec file with spec-cleaner
+
+-------------------------------------------------------------------
 Fri Apr 10 22:16:28 UTC 2015 - antoine.belvire@laposte.net
 
 - Update to 0.3.5:

pulseaudio-dlna.spec Changed

@@ -1,7 +1,7 @@
 #
 # spec file for package pulseaudio-dlna
 #
-# Copyright (c) 2015 Antoine Belvire <antoine.belvire@laposte.net>
+# Copyright (c) 2015 Packman Team <packman@links2linux.de>
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -15,34 +15,38 @@
 # Please submit bugfixes or comments via http://bugs.links2linux.org/
 #
 
+
 Name:           pulseaudio-dlna
-Version:        0.3.5
+Version:        0.4.1
 Release:        0
-License:        GPL-3.0
 Summary:        A DLNA server which brings DLNA/UPnP support to PulseAudio
-Url:            https://github.com/masmu/%{name}
+License:        GPL-3.0
 Group:          Productivity/Multimedia/Sound/Utilities
+Url:            https://github.com/masmu/%{name}
 Source:         https://github.com/masmu/%{name}/archive/%{version}/%{name}-%{version}.tar.gz
 BuildRequires:  python-setuptools
+Requires:       dbus-1-python >= 1.2.0
+Requires:       faac >= 1.28
+Requires:       flac >= 1.3.0
+Requires:       lame >= 3.99.0
+Requires:       opus-tools >= 0.1.8
 Requires:       pulseaudio
 Requires:       python == 2.7
-Requires:       dbus-1-python >= 1.2.0
 Requires:       python-beautifulsoup >= 3.2.1
 Requires:       python-docopt >= 0.6.1
 Requires:       python-gobject >= 3.12.0
+Requires:       python-notify2 >= 0.3
+Requires:       python-protobuf >= 2.5.0
 Requires:       python-requests >= 2.2.1
 Requires:       python-setproctitle >= 1.0.1
-Requires:       vorbis-tools >= 1.4.0
 Requires:       sox >= 14.4.1
-Requires:       lame >= 3.99.0
-Requires:       flac >= 1.3.0
-Requires:       opus-tools >= 0.1.8
+Requires:       vorbis-tools >= 1.4.0
 BuildRoot:      %{_tmppath}/%{name}-%{version}-build
 BuildArch:      noarch
 
 %description
-This is pulseaudio-dlna. A small DLNA server which brings DLNA / UPnP support
-to PulseAudio and Linux.
+This is pulseaudio-dlna. A small DLNA server which brings DLNA / UPnP and
+Chromecast support to PulseAudio and Linux.
 
 It can stream your current PulseAudio playback to different UPnP devices (UPnP
 Media Renderers) in your network. It's main goals are: easy to use, no
@@ -52,17 +56,17 @@
 %setup -q
 
 %build
-%__python setup.py build
+python setup.py build
 
 %install
-%__python setup.py install --prefix=%{_prefix} --root=%{buildroot}
+python setup.py install --prefix=%{_prefix} --root=%{buildroot}
 
 %files
 %defattr(-,root,root)
 %doc debian/changelog README.md LICENSE
 %{_bindir}/%{name}
-%{python_sitelib}/pulseaudio_dlna-%{version}*egg-info/
+%{python_sitelib}/pulseaudio_dlna-%{version}-py%{py_ver}.egg-info/
 %{python_sitelib}/pulseaudio_dlna/
-%{_mandir}/man1/%{name}.1%{?ext_man} 
+%{_mandir}/man1/%{name}.1%{?ext_man}
 
 %changelog

pulseaudio-dlna-0.3.5.tar.gz/pulseaudio_dlna/upnp Deleted

pulseaudio-dlna-0.3.5.tar.gz/pulseaudio_dlna/upnp/__init__.py Deleted

pulseaudio-dlna-0.3.5.tar.gz/pulseaudio_dlna/upnp/discover.py Deleted

@@ -1,87 +0,0 @@
-#!/usr/bin/python
-
-# This file is part of pulseaudio-dlna.
-
-# pulseaudio-dlna is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# pulseaudio-dlna is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import unicode_literals
-
-import socket as s
-import renderer
-import logging
-import time
-
-
-class BaseUpnpMediaRendererDiscover(object):
-
-    SSDP_ADDRESS = '239.255.255.250'
-    SSDP_PORT = 1900
-
-    MSEARCH = 'M-SEARCH * HTTP/1.1\r\n' + \
-              'HOST: {}:{}\r\n'.format(SSDP_ADDRESS, SSDP_PORT) + \
-              'MAN: "ssdp:discover"\r\n' + \
-              'MX: 2\r\n' + \
-              'ST: urn:schemas-upnp-org:device:MediaRenderer:1\r\n\r\n'
-
-    def search(self, ttl=10, timeout=5, times=2):
-        s.setdefaulttimeout(timeout)
-        sock = s.socket(s.AF_INET, s.SOCK_DGRAM, s.IPPROTO_UDP)
-        sock.setsockopt(s.IPPROTO_IP, s.IP_MULTICAST_TTL, ttl)
-
-        for i in range(0, times):
-            sock.sendto(self.MSEARCH, (self.SSDP_ADDRESS, self.SSDP_PORT))
-            time.sleep(0.1)
-
-        buffer_size = 1024
-        while True:
-            try:
-                header, address = sock.recvfrom(buffer_size)
-                self._header_received(header, address)
-            except s.timeout:
-                break
-        sock.close()
-
-    def _header_received(self, header, address):
-        pass
-
-
-class UpnpMediaRendererDiscover(BaseUpnpMediaRendererDiscover):
-
-    def __init__(self, device_filter=None):
-        self.renderers = None
-        self.device_filter = device_filter
-
-    def search(self, ttl=10, timeout=5, times=2):
-        self.renderers = []
-        BaseUpnpMediaRendererDiscover.search(self, ttl, timeout, times)
-
-    def _add_renderer(self, upnp_device):
-        if upnp_device not in self.renderers:
-            self.renderers.append(upnp_device)
-
-    def _header_received(self, header, address):
-        logging.debug("Recieved the following SSDP header: \n{header}".format(
-            header=header))
-        upnp_device = renderer.UpnpMediaRendererFactory.from_header(
-            header,
-            renderer.CoinedUpnpMediaRenderer)
-        if upnp_device is not None:
-            if self.device_filter is None:
-                self._add_renderer(upnp_device)
-            else:
-                if upnp_device.name in self.device_filter:
-                    self._add_renderer(upnp_device)
-                else:
-                    logging.info('Skipped the device "{name}."'.format(
-                        name=upnp_device.name))

pulseaudio-dlna-0.3.5.tar.gz/pulseaudio_dlna/upnp/renderer.py Deleted

@@ -1,312 +0,0 @@
-#!/usr/bin/python
-
-# This file is part of pulseaudio-dlna.
-
-# pulseaudio-dlna is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# pulseaudio-dlna is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import unicode_literals
-
-import re
-import cgi
-import requests
-import urlparse
-import socket
-import logging
-import functools
-import random
-import BeautifulSoup
-import pulseaudio_dlna.pulseaudio
-
-
-@functools.total_ordering
-class UpnpMediaRenderer(object):
-
-    REGISTER_XML = """<?xml version="1.0" encoding="{encoding}" standalone="yes"?>
-<s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
-    <s:Body>
-        <u:SetAVTransportURI xmlns:u="urn:schemas-upnp-org:service:AVTransport:1">
-            <InstanceID>0</InstanceID>
-            <CurrentURI>{stream_url}</CurrentURI>
-            <CurrentURIMetaData>{current_url_metadata}</CurrentURIMetaData>
-        </u:SetAVTransportURI>
-    </s:Body>
-</s:Envelope>"""
-
-    REGISTER_XML_METADATA = """<?xml version="1.0" encoding="{encoding}"?>
-<DIDL-Lite xmlns="urn:schemas-upnp-org:metadata-1-0/DIDL-Lite/" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:dlna="urn:schemas-dlna-org:metadata-1-0/" xmlns:sec="http://www.sec.co.kr/" xmlns:upnp="urn:schemas-upnp-org:metadata-1-0/upnp/">
-    <item id="0" parentID="0" restricted="1">
-        <upnp:class>object.item.audioItem.musicTrack</upnp:class>
-        <dc:title>{title}</dc:title>
-        <dc:creator>{creator}</dc:creator>
-        <upnp:artist>{artist}</upnp:artist>
-        <upnp:albumArtURI></upnp:albumArtURI>
-        <upnp:album>{album}</upnp:album>
-        <res protocolInfo="http-get:*:audio/mpeg:DLNA.ORG_OP=00;DLNA.ORG_FLAGS=01700000000000000000000000000000">{stream_url}</res>
-    </item>
-</DIDL-Lite>"""
-
-    PLAY_XML = """<?xml version="1.0" encoding="{encoding}" standalone="yes"?>
-<s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
-    <s:Body>
-        <u:Play xmlns:u="urn:schemas-upnp-org:service:AVTransport:1">
-            <InstanceID>0</InstanceID>
-            <Speed>1</Speed>
-        </u:Play>
-    </s:Body>
-</s:Envelope>
-"""
-
-    STOP_XML = """<?xml version="1.0" encoding="{encoding}" standalone="yes"?>
-<s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
-    <s:Body>
-        <u:Stop xmlns:u="urn:schemas-upnp-org:service:AVTransport:1">
-            <InstanceID>0</InstanceID>
-        </u:Stop>
-    </s:Body>
-</s:Envelope>"""
-
-    PAUSE_XML = """<?xml version="1.0" encoding="{encoding}" standalone="yes"?>
-<s:Envelope s:encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" xmlns:s="http://schemas.xmlsoap.org/soap/envelope/">
-    <s:Body>
-        <u:Pause xmlns:u="urn:schemas-upnp-org:service:AVTransport:1">
-            <InstanceID>0</InstanceID>
-        </u:Pause>
-    </s:Body>
-</s:Envelope>"""
-
-    PLAYING = 'playing'
-    IDLE = 'idle'
-    PAUSE = 'paused'
-
-    ENCODING = 'utf-8'
-
-    def __init__(self, name, ip, port, udn, services):
-        name = name.strip()
-        if name == '':
-            name = 'Unnamed device (#{random_id})'.format(
-                random_id=random.randint(1000, 9999))
-        self.name = name
-        self.short_name = self._short_name(name)
-        self.ip = ip
-        self.port = port
-        self.udn = udn
-        self.services = services
-        self.state = self.IDLE
-
-    def _short_name(self, name):
-        return re.sub(r'[^a-z0-9]', '', name.lower())
-
-    def _get_av_transport(self):
-        for service in self.services:
-            if service['service_type'].startswith(
-                    'urn:schemas-upnp-org:service:AVTransport:'):
-                return service
-
-    def _get_av_transport_url(self):
-        av_transport = self._get_av_transport()
-        return self._get_url(av_transport['control_url'])
-
-    def _get_url(self, control_url):
-        host = 'http://{ip}:{port}'.format(
-            ip=self.ip,
-            port=self.port,
-        )
-        return urlparse.urljoin(host, control_url)
-
-    def _debug(self, action, url, headers, data, response):
-        logging.debug(
-            'sending {action} to {url}:\n'
-            ' - headers:\n{headers}\n'
-            ' - data:\n{data}'
-            ' - result: {status_code}\n{result}'.format(
-                action=action.upper(),
-                url=url,
-                headers=headers,
-                data=data,
-                status_code=response.status_code,
-                result=response.text))
-
-    def register(self, stream_url):
-        url = self._get_av_transport_url()
-        headers = {
-            'Content-Type':
-                'text/xml; charset="{encoding}"'.format(encoding=self.ENCODING),
-            'SOAPAction': '"urn:schemas-upnp-org:service:AVTransport:1#SetAVTransportURI"',
-        }
-        metadata = self.REGISTER_XML_METADATA.format(
-            stream_url=stream_url,
-            title='Live Audio',
-            artist='PulseAudio on {}'.format(socket.gethostname()),
-            creator='PulseAudio',
-            album='Stream',
-            encoding=self.ENCODING,
-        )
-        data = self.REGISTER_XML.format(
-            stream_url=stream_url,
-            current_url_metadata=cgi.escape(metadata),
-            encoding=self.ENCODING,
-        )
-        response = requests.post(
-            url, data=data.encode(self.ENCODING), headers=headers)
-        self._debug('register', url, headers, data, response)
-        return response.status_code
-
-    def play(self):
-        url = self._get_av_transport_url()
-        headers = {
-            'Content-Type':
-                'text/xml; charset="{encoding}"'.format(encoding=self.ENCODING),
-            'SOAPAction': '"urn:schemas-upnp-org:service:AVTransport:1#Play"',
-        }
-        data = self.PLAY_XML.format(
-            encoding=self.ENCODING,
-        )
-        response = requests.post(
-            url, data=data.encode(self.ENCODING), headers=headers)
-        if response.status_code == 200:
-            self.state = self.PLAYING
-        self._debug('play', url, headers, data, response)
-        return response.status_code
-
-    def stop(self):
-        url = self._get_av_transport_url()
-        headers = {
-            'Content-Type':
-                'text/xml; charset="{encoding}"'.format(encoding=self.ENCODING),
-            'SOAPAction': '"urn:schemas-upnp-org:service:AVTransport:1#Stop"',
-        }
-        data = self.STOP_XML.format(
-            encoding=self.ENCODING,
-        )
-        response = requests.post(
-            url, data=data.encode(self.ENCODING), headers=headers)
-        if response.status_code == 200:
-            self.state = self.IDLE
-        self._debug('stop', url, headers, data, response)
-        return response.status_code
-
-    def pause(self):
-        url = self._get_av_transport_url()
-        headers = {
-            'Content-Type':
-                'text/xml; charset="{encoding}"'.format(encoding=self.ENCODING),
-            'SOAPAction': '"urn:schemas-upnp-org:service:AVTransport:1#Stop"',
-        }
-        data = self.PAUSE_XML.format(
-            encoding=self.ENCODING,
-        )
-        response = requests.post(
-            url, data=data.encode(self.ENCODING), headers=headers)
-        if response.status_code == 200:
-            self.state = self.PAUSE
-        self._debug('pause', url, headers, data, response)
-        return response.status_code
-
-    def __eq__(self, other):
-        if isinstance(other, UpnpMediaRenderer):
-            return self.name == other.name
-        if isinstance(other, pulseaudio_dlna.pulseaudio.PulseUpnpBridge):
-            return self.name == other.upnp_device.name
-
-    def __gt__(self, other):
-        if isinstance(other, UpnpMediaRenderer):
-            return self.name > other.name
-        if isinstance(other, pulseaudio_dlna.pulseaudio.PulseUpnpBridge):
-            return self.name > other.upnp_device.name
-
-    def __str__(self):
-        return '<UpnpMediaRenderer name="{}" short_name="{}" state="{}">'.format(
-            self.name,
-            self.short_name,
-            self.state,
-        )
-
-
-class CoinedUpnpMediaRenderer(UpnpMediaRenderer):
-    def __init__(self, *args):
-        UpnpMediaRenderer.__init__(self, *args)
-        self.server_url = None
-        self.stream_url = None
-
-    def set_server_url(self, server_url):
-        self.server_url = server_url
-        self.stream_name = '/{stream_name}.stream'.format(
-            stream_name=self.short_name,
-        )
-        self.stream_url = urlparse.urljoin(self.server_url, self.stream_name)
-        logging.debug('setting stream url for {device_name} to "{url}"'.format(
-            device_name=self.name,
-            url=self.stream_url))
-
-    def register(self):
-        return UpnpMediaRenderer.register(self, self.stream_url)
-
-    def __str__(self):
-        return '<CoinedUpnpMediaRenderer name="{}" short_name="{}" state="{}">'.format(
-            self.name,
-            self.short_name,
-            self.state,
-        )
-
-
-class UpnpMediaRendererFactory(object):
-
-    ST_HEADER = 'urn:schemas-upnp-org:device:MediaRenderer:1'
-
-    @classmethod
-    def from_url(self, url, type_=UpnpMediaRenderer):
-        try:
-            response = requests.get(url)
-            logging.debug('Response from upnp device ({url})\n'
-                          '{response}'.format(url=url, response=response.text))
-        except requests.exceptions.ConnectionError:
-            logging.info(
-                'Could no connect to {url}. '
-                'Connection refused.'.format(url=url))
-            return None
-        soup = BeautifulSoup.BeautifulSoup(response.content)
-        url_object = urlparse.urlparse(url)
-        ip, port = url_object.netloc.split(':')
-        services = []
-        try:
-            for device in soup.root.findAll('device'):
-                if device.devicetype.text != self.ST_HEADER:
-                    continue
-                for service in device.findAll('service'):
-                    service = {
-                        'service_type': service.servicetype.text,
-                        'service_id': service.serviceid.text,
-                        'scpd_url': service.scpdurl.text,
-                        'control_url': service.controlurl.text,
-                        'eventsub_url': service.eventsuburl.text,
-                    }
-                    services.append(service)
-                upnp_device = type_(
-                    soup.root.device.friendlyname.text,
-                    ip,
-                    port,
-                    soup.root.device.udn.text,
-                    services)
-                return upnp_device
-        except AttributeError:
-            logging.info(
-                'No valid XML returned from {url}.'.format(url=url))
-            return None
-
-    @classmethod
-    def from_header(self, header, type_=UpnpMediaRenderer):
-        header = re.findall(r"(?P<name>.*?): (?P<value>.*?)\r\n", header)
-        header = {k.lower(): v for k, v in dict(header).items()}
-        if header['location']:
-            return self.from_url(header['location'], type_)

pulseaudio-dlna-0.3.5.tar.gz/pulseaudio_dlna/upnp/server.py Deleted

@@ -1,164 +0,0 @@
-#!/usr/bin/python
-
-# This file is part of pulseaudio-dlna.
-
-# pulseaudio-dlna is free software: you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation, either version 3 of the License, or
-# (at your option) any later version.
-
-# pulseaudio-dlna is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-
-# You should have received a copy of the GNU General Public License
-# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
-
-from __future__ import unicode_literals
-
-import sys
-import subprocess
-import setproctitle
-import logging
-import errno
-import BaseHTTPServer
-import SocketServer
-
-
-class DlnaRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
-    def __init__(self, *args):
-        try:
-            BaseHTTPServer.BaseHTTPRequestHandler.__init__(self, *args)
-        except IOError:
-            pass
-
-    def do_HEAD(self):
-        self.send_response(200)
-        self.send_header('Content-Type', self.server.encoder_mime)
-        self.end_headers()
-
-    def do_GET(self):
-        self.do_HEAD()
-        bridge = self.get_bridge(self.path)
-        if bridge is None:
-            logging.info('error 404: file not found "{}"'.format(self.path))
-            self.send_error(404, 'file not found: %s' % self.path)
-        else:
-            logging.info('starting sending stream to "{}"'.format(
-                bridge.upnp_device.name))
-            recorder_process, encoder_process = self.create_processes(bridge)
-            while True:
-                stream_data = encoder_process.stdout.read(1024)
-                if recorder_process.poll() is not None or \
-                   encoder_process.poll() is not None:
-                    self.cleanup_process(recorder_process)
-                    self.cleanup_process(encoder_process)
-                    recorder_process, encoder_process = self.create_processes(
-                        bridge)
-                try:
-                    self.wfile.write(stream_data)
-                except IOError as e:
-                    if e.errno == errno.EPIPE:
-                        logging.info('stream closed. '
-                                     'cleaning up remaining procecces')
-                        self.cleanup_process(recorder_process)
-                        self.cleanup_process(encoder_process)
-                        break
-
-    def create_processes(self, bridge):
-        recorder_process = subprocess.Popen(
-            self.server.recorder_cmd.format(
-                bridge.sink.monitor).split(' '),
-            stdout=subprocess.PIPE)
-        encoder_process = subprocess.Popen(
-            self.server.encoder_cmd.split(' '),
-            stdin=recorder_process.stdout,
-            stdout=subprocess.PIPE)
-        recorder_process.stdout.close()
-        return recorder_process, encoder_process
-
-    def cleanup_process(self, process):
-        try:
-            process.kill()
-        except:
-            pass
-
-    def get_bridge(self, path):
-        for bridge in self.server.bridges:
-            if self.path == bridge.upnp_device.stream_name:
-                return bridge
-        return None
-
-
-class DlnaServer(SocketServer.TCPServer):
-
-    ENCODER_LAME = 'lame'
-    ENCODER_FLAC = 'flac'
-    ENCODER_OGG = 'ogg'
-    ENCODER_OPUS = 'opus'
-    ENCODER_WAV = 'wav'
-    RECORDER_PULSEAUDIO = 'pulseaudio'
-
-    def __init__(self, ip, port, recorder=None, encoder=None, *args):
-        setproctitle.setproctitle('dlna_server')
-        SocketServer.TCPServer.allow_reuse_address = True
-        SocketServer.TCPServer.__init__(
-            self, ('', port), DlnaRequestHandler, *args)
-
-        self.ip = ip
-        self.port = port
-        self.recorder_cmd = None
-        self.encoder_cmd = None
-        self.encoder_mime = None
-        self.bridges = []
-
-        self.encoders = [
-            self.ENCODER_LAME,
-            self.ENCODER_FLAC,
-            self.ENCODER_OGG,
-            self.ENCODER_OPUS,
-            self.ENCODER_WAV,
-        ]
-
-        self.set_recorder()
-        self.set_encoder(encoder)
-
-    def get_server_url(self):
-        return 'http://{ip}:{port}'.format(
-            ip=self.ip,
-            port=self.port,
-        )
-
-    def set_bridges(self, bridges):
-        self.bridges = bridges
-
-    def set_recorder(self, type_=None):
-        type_ = type_ or self.RECORDER_PULSEAUDIO
-        if type_ == self.RECORDER_PULSEAUDIO:
-            self.recorder_cmd = 'parec --format=s16le -d {}'
-
-    def set_encoder(self, type_=None):
-        type_ = type_ or self.ENCODER_LAME
-        if type_ not in self.encoders:
-            logging.error('You specified an encoder which does not exists!')
-            sys.exit(1)
-        if type_ == self.ENCODER_LAME:
-            self.encoder_cmd = 'lame -r -b 320 -'
-            self.encoder_mime = 'audio/mpeg'
-        if type_ == self.ENCODER_FLAC:
-            self.encoder_cmd = 'flac - -c --channels 2 --bps 16 --sample-rate 44100 --endian little --sign signed'
-            self.encoder_mime = 'audio/flac'
-        if type_ == self.ENCODER_OGG:
-            self.encoder_cmd = 'oggenc -r -'
-            self.encoder_mime = 'audio/ogg'
-        if type_ == self.ENCODER_OPUS:
-            self.encoder_cmd = 'opusenc --padding 0 --max-delay 0 --expect-loss 1 --framesize 2.5 --raw-rate 44100 --raw --bitrate 64 - -'
-            self.encoder_mime = 'audio/opus'
-        if type_ == self.ENCODER_WAV:
-            self.encoder_cmd = 'sox -t raw -b 16 -e signed -c 2 -r 44100 - -t wav -r 44100 -b 16 -L -e signed -c 2 -'
-            self.encoder_mime = 'audio/wav'
-
-
-class ThreadedDlnaServer(SocketServer.ThreadingMixIn, DlnaServer):
-    pass

pulseaudio-dlna-0.3.5.tar.gz/.gitignore -> pulseaudio-dlna-0.4.1.tar.gz/.gitignore Changed

pulseaudio-dlna-0.3.5.tar.gz/Makefile -> pulseaudio-dlna-0.4.1.tar.gz/Makefile Changed

@@ -16,22 +16,27 @@
 python ?= python2.7
 user ?= $(shell whoami)
 
-all:
+all: pulseaudio_dlna.egg-info
 
-venv: pulseaudio_dlna.egg-info
+venv:
+	@echo "venv is deprecated. It is just 'make' now."
 
 pulseaudio_dlna.egg-info: setup.py bin/pip
 	bin/pip install --editable . && touch $@
 bin/pip:
 	virtualenv --system-site-packages -p $(python) .
 
+ifdef DEB_HOST_ARCH
+DESTDIR ?= /
+PREFIX ?= usr/
 install:
-	sudo $(python) setup.py develop
-	sudo chown -R $(user) pulseaudio_dlna.egg-info/
-
-uninstall:
-	sudo $(python) setup.py develop --uninstall
-	sudo rm /usr/local/bin/pulseaudio-dlna || true
+	$(python) setup.py install --no-compile --prefix="$(PREFIX)" --root="$(DESTDIR)" --install-layout=deb
+else
+DESTDIR ?= /
+PREFIX ?= /usr/local
+install:
+	$(python) setup.py install --no-compile --prefix="$(PREFIX)" --root="$(DESTDIR)"
+endif
 
 release: manpage
 	pdebuild --buildresult dist
@@ -44,13 +49,6 @@
 	help2man "bin/pulseaudio-dlna" > /tmp/pulseaudio-dlna.1
 	mv /tmp/pulseaudio-dlna.1 debian/pulseaudio-dlna.1
 
-ifdef DEB_HOST_ARCH
-DESTDIR ?= /
-PREFIX ?= usr/
-install:
-	$(python) setup.py install --no-compile --prefix="$(PREFIX)" --root="$(DESTDIR)" --install-layout=deb
-endif
-
 clean:
 	rm -rf build dist $(shell find pulseaudio_dlna -name "__pycache__")
 	rm -rf *.egg-info *.egg bin local lib lib64 include share pyvenv.cfg

pulseaudio-dlna-0.3.5.tar.gz/README.md -> pulseaudio-dlna-0.4.1.tar.gz/README.md Changed

@@ -1,10 +1,10 @@
 # About #
 
 This is _pulseaudio-dlna_. A small DLNA server which brings DLNA / UPNP
-support to PulseAudio and Linux.
+and Chromecast support to PulseAudio and Linux.
 
 It can stream your current PulseAudio playback to different UPNP devices
-(UPNP Media Renderers) in your network.
+(UPNP Media Renderers) or Chromecasts in your network.
 It's main goals are: easy to use, no configuration hassle, no
 big dependencies.
 
@@ -34,6 +34,30 @@
 
 ## Changelog ##
 
+ * __0.4.1__ - (_2015-07-27_)
+    - Fixed Makefile for launchpad
+
+ * __0.4.0__ - (_2015-07-27_)
+    - Added the ```--fake-http10-content-length``` option
+    - The application can now run as root
+    - Catch pulseaudio exceptions for streams, sinks and modules when those are gone
+    - Fixed a bug where a missing ssdp header field made the application crash
+    - New devices are added now during runtime (thanks to [coder-hugo](https://github.com/coder-hugo))
+    - Rewrite of the streaming server
+    - Upnp devices can now request their audio format based on their capabilities
+    - Added AAC encoder
+    - If a device stops playing, the streams currently playing on
+      the corresponding sink are switched back to the default sink
+    - If a device failes to start playing, streams currently playing on
+      the corresponding sink are switched back to the default sink
+    - Added Chromecast support (new dependency: `python-protobuf`)
+    - Fixed a bug where the application crashed when there was no suitable encoder found
+    - Added the ```--bit-rate``` option
+    - Added additional headers for DLNA devices
+    - Added switch back mode also for sinks, not just for streams (new dependency: `python-notify2`)
+    - Added better logging
+    - Validate encoders for installed dependencies
+
  * __0.3.5__ - (_2015-04-09_)
     - Fixed a bug where Sonos description XML could not get parsed correctly
 
@@ -77,6 +101,11 @@
 
 ## Installation via PPA ##
 
+Supported Ubuntu releases:
+- 15.04 (Vivid Vervet)
+- 14.10 (Utopic Unicorn)
+- 14.04.2 LTS (Trusty Tahr)
+
 Ubuntu users can install _pulseaudio-dlna_ via the following [repository](https://launchpad.net/~qos/+archive/ubuntu/pulseaudio-dlna).
 
     sudo apt-add-repository ppa:qos/pulseaudio-dlna
@@ -91,6 +120,17 @@
 
 Head over the the _using section_ for further instructions.
 
+## Installation for other distributions ##
+
+Some community members are providing packages for others distributions.
+_Keep in mind that since i am not using those, i can hardly support them!_
+
+- Arch Linux
+    [https://aur.archlinux.org/packages/pulseaudio-dlna/](https://aur.archlinux.org/packages/pulseaudio-dlna/)
+- openSUSE (_.rpm_)
+    [http://packman.links2linux.de/package/pulseaudio-dlna](http://packman.links2linux.de/package/pulseaudio-dlna)
+
+
 ## Installation via git ##
 
 Other linux users can clone this git repository,
@@ -104,34 +144,38 @@
 
 - python2.7
 - python-pip
+- python-setuptools
 - python-dbus
 - python-beautifulsoup
 - python-docopt
 - python-requests
 - python-setproctitle
 - python-gobject
+- python-protobuf
+- python-notify2
 - vorbis-tools
 - sox
 - lame
 - flac
+- faac
 - opus-tools
 
 You can install all the dependencies in Ubuntu via:
 
-    sudo apt-get install python2.7 python-pip python-dbus python-beautifulsoup python-docopt python-requests python-setproctitle python-gobject vorbis-tools sox lame flac opus-tools
+    sudo apt-get install python2.7 python-pip python-setuptools python-dbus python-beautifulsoup python-docopt python-requests python-setproctitle python-gobject python-protobuf python-notify2 vorbis-tools sox lame flac faac opus-tools
 
 ### PulseAudio DBus module ###
 
 Since version _0.2.2_ the DBus module should be loaded automatically, if it was
 not loaded before.
 It that does not work, you can load the DBus module in Ubuntu via the following
-command. Note that you 
+command. Note that you
 have to do this every time you restart PulseAudio (or your computer).
 
     pacmd load-module module-dbus-protocol
 
 Or to make changes persistant edit the file `/etc/pulse/default.pa` with your
-favorite editor and append the following line: 
+favorite editor and append the following line:
 
     load-module module-dbus-protocol
 
@@ -144,18 +188,23 @@
 
 #### virtualenv requirements ####
 
-- python-virtualenv
+- python-virtualenv (Ubuntu <= _14.04 Trusty LTS_)
+- virtualenv (Ubuntu >= _14.10 Utopic_)
 - python-dev
 
-You can install all the dependencies in Ubuntu via:
+So all Ubuntu versions prior to _14.10 Utopic_ need to install:
 
     sudo apt-get install python-virtualenv python-dev
 
+All Ubuntu versions above install:
+
+    sudo apt-get install virtualenv python-dev
+
 #### Installing & starting ####
 
 Change to the _project root folder_ and start the installation via:
 
-    make venv
+    make
 
 After that you can start _pulseaudio-dlna_ via:
 
@@ -207,35 +256,37 @@
 ### CLI ###
 
     Usage:
-        pulseaudio-dlna [--host <host>] [--port <port>] [--encoder <encoder>] [--filter-device=<filter-device>] [--renderer-urls <urls>] [--debug]
+        pulseaudio-dlna [--host <host>] [--port <port>] [--encoder <encoder>] [--bit-rate=<rate>] [--filter-device=<filter-device>] [--renderer-urls <urls>] [--debug] [--fake-http10-content-length]
         pulseaudio-dlna [-h | --help | --version]
 
     Options:
            --host=<host>                       Set the server ip.
         -p --port=<port>                       Set the server port [default: 8080].
-        -e --encoder=<encoder>                 Set the audio encoder [default: lame].
+        -e --encoder=<encoder>                 Set the audio encoder.
                                                Possible encoders are:
-                                                 - lame  MPEG Audio Layer III (MP3)
+                                                 - mp3   MPEG Audio Layer III (MP3)
                                                  - ogg   Ogg Vorbis
                                                  - flac  Free Lossless Audio Codec (FLAC)
                                                  - wav   Waveform Audio File Format (WAV)
                                                  - opus  Opus Interactive Audio Codec (OPUS)
+        -b --bit-rate=<rate>                   Set the audio encoder's bitrate.
         --filter-device=<filter-device>        Set a name filter for devices which should be added.
                                                Devices which get discovered, but won't match the
                                                filter text will be skipped.
         --renderer-urls=<urls>                 Set the renderer urls yourself. no discovery will commence.
         --debug                                enables detailed debug messages.
+        --fake-http10-content-length           If set, the content-length of HTTP 1.0 requests will be set to 100 GB.
         -v --version                           Show the version.
         -h --help                              Show the help.
 
 Samples:
-- `pulseaudio-dlna` will start 
+- `pulseaudio-dlna` will start
 _pulseaudio-dlna_ on port _8080_ and stream your PulseAudio streams encoded
 with _mp3_.
-- `pulseaudio-dlna --encoder ogg` will start 
+- `pulseaudio-dlna --encoder ogg` will start
 _pulseaudio-dlna_ on port _8080_ and stream your PulseAudio streams encoded
 with _Ogg Vorbis_.
-- `pulseaudio-dlna --port 10291 --encoder flac` will start 
+- `pulseaudio-dlna --port 10291 --encoder flac` will start
 _pulseaudio-dlna_ on port _10291_ and stream your PulseAudio streams encoded
 with _FLAC_.
 - `pulseaudio-dlna --filter-device 'Nexus 5,TV'` will just use devices named
@@ -247,6 +298,17 @@
 UDP multicast packages won't work (most times) over VPN connections this is
 very useful if you ever plan to stream to a UPNP device over VPN.
 
+## Troubleshooting ##
+
+Some devices do not stick to the HTTP 1.0/1.1 standard. Since most devices do,
+_pulseaudio-dlna_ must be instructed by CLI flags to act in a non-standard way.
+
+- `--fake-http10-content-length`
+
+    Adds a faked HTTP Content-Length to HTTP 1.0 responses. The length is set 
+    to 100 GB and ensures that the device would keep playing for months.
+    This is necessary for the _Hame Soundrouter_.
+
 ## Tested devices ##
 
 _pulseaudio-dlna_ was successfully tested on the follwing devices / applications:
@@ -261,7 +323,15 @@
 - Yamaha RX-475 (AV Receiver)
 - Majik DSM
 - [Pi MusicBox](http://www.woutervanwijk.nl/pimusicbox/)
+- Google Chromecast
+- Sonos PLAY:1
+- Sonos PLAY:3
+- Hame Soundrouter
 - [Raumfeld Speaker M](http://raumfeld.com)
+- Pioneer VSX-824 (AV Receiver)
+- [ROCKI] (http://www.myrocki.com/)
+- Sony STR-DN1050 (AV Receiver)
+- Pure Jongo S3
 
 ## Supported encoders ##
 
@@ -272,3 +342,4 @@
 - __flac__  Free Lossless Audio Codec (FLAC)
 - __wav__   Waveform Audio File Format (WAV)
 - __opus__  Opus Interactive Audio Codec (OPUS)
+- __aac__   Advanced Audio Coding (AAC)

pulseaudio-dlna-0.3.5.tar.gz/debian/changelog -> pulseaudio-dlna-0.4.1.tar.gz/debian/changelog Changed

@@ -1,3 +1,37 @@
+pulseaudio-dlna (0.4.1) trusty; urgency=low
+
+  * Fixed Makefile for launchpad
+
+ -- Massimo Mund <mo@lancode.de>  Mon, 27 Jul 2015 11:40:37 +0100
+
+
+pulseaudio-dlna (0.4.0) trusty; urgency=low
+
+  * Added the --fake-http10-content-length option
+  * The application can now run as root
+  * Catch pulseaudio exceptions for streams, sinks and modules when those are
+    gone
+  * Fixed a bug where a missing ssdp header field made the application crash
+  * New devices are added now during runtime
+  * Rewrite of the streaming server
+  * Upnp devices can now request their audio format based on their capabilities
+  * Added AAC encoder
+  * If a device stops playing, the streams currently playing on the
+    corresponding sink are switched back to the default sink
+  * If a device failes to start playing, streams currently playing on the
+    corresponding sink are switched back to the default sink
+  * Added Chromecast support
+  * Fixed a bug where the application crashed when there was no suitable
+    encoder found
+  * Added the --bit-rate option
+  * Added additional headers for DLNA devices
+  * Added switch back mode also for sinks, not just for streams
+  * Added better logging
+  * Validate encoders for installed dependencies
+
+ -- Massimo Mund <mo@lancode.de>  Mon, 27 Jul 2015 10:23:02 +0100
+
+
 pulseaudio-dlna (0.3.5) trusty; urgency=low
 
   * Fixed a bug where Sonos description XML could not get parsed correctly

pulseaudio-dlna-0.3.5.tar.gz/debian/control -> pulseaudio-dlna-0.4.1.tar.gz/debian/control Changed

pulseaudio-dlna-0.3.5.tar.gz/debian/pulseaudio-dlna.1 -> pulseaudio-dlna-0.4.1.tar.gz/debian/pulseaudio-dlna.1 Changed

@@ -1,11 +1,11 @@
 .\" DO NOT MODIFY THIS FILE!  It was generated by help2man 1.44.1.
-.TH PULSEAUDIO-DLNA "1" "April 2015" "pulseaudio-dlna 0.3.5" "User Commands"
+.TH PULSEAUDIO-DLNA "1" "July 2015" "pulseaudio-dlna 0.4.1" "User Commands"
 .SH NAME
-pulseaudio-dlna \- manual page for pulseaudio-dlna 0.3.5
+pulseaudio-dlna \- manual page for pulseaudio-dlna 0.4.1
 .SH DESCRIPTION
 .SS "Usage:"
 .IP
-pulseaudio\-dlna [\-\-host <host>] [\-\-port <port>] [\-\-encoder <encoder>] [\-\-filter\-device=<filter\-device>] [\-\-renderer\-urls <urls>] [\-\-debug]
+pulseaudio\-dlna [\-\-host <host>] [\-\-port <port>] [\-\-encoder <encoder>] [\-\-bit\-rate=<rate>] [\-\-filter\-device=<filter\-device>] [\-\-renderer\-urls <urls>] [\-\-debug] [\-\-fake\-http10\-content\-length]
 pulseaudio\-dlna [\-h | \fB\-\-help\fR | \fB\-\-version]\fR
 .SH OPTIONS
 .TP
@@ -16,10 +16,10 @@
 Set the server port [default: 8080].
 .TP
 \fB\-e\fR \fB\-\-encoder=\fR<encoder>
-Set the audio encoder [default: lame].
+Set the audio encoder.
 Possible encoders are:
 .TP
-\- lame
+\- mp3
 MPEG Audio Layer III (MP3)
 .TP
 \- ogg
@@ -34,6 +34,9 @@
 \- opus
 Opus Interactive Audio Codec (OPUS)
 .TP
+\fB\-b\fR \fB\-\-bit\-rate=\fR<rate>
+Set the audio encoder's bitrate.
+.TP
 \fB\-\-filter\-device=\fR<filter\-device>
 Set a name filter for devices which should be added.
 Devices which get discovered, but won't match the
@@ -45,6 +48,9 @@
 \fB\-\-debug\fR
 enables detailed debug messages.
 .TP
+\fB\-\-fake\-http10\-content\-length\fR
+If set, the content\-length of HTTP 1.0 requests will be set to 100 GB.
+.TP
 \fB\-v\fR \fB\-\-version\fR
 Show the version.
 .TP

pulseaudio-dlna-0.3.5.tar.gz/debian/rules -> pulseaudio-dlna-0.4.1.tar.gz/debian/rules Changed

pulseaudio-dlna-0.3.5.tar.gz/pulseaudio_dlna/__main__.py -> pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/__main__.py Changed

@@ -17,148 +17,64 @@
 
 '''
 Usage:
-    pulseaudio-dlna [--host <host>] [--port <port>] [--encoder <encoder>] [--filter-device=<filter-device>] [--renderer-urls <urls>] [--debug]
+    pulseaudio-dlna [--host <host>] [--port <port>] [--encoder <encoder>] [--bit-rate=<rate>] [--filter-device=<filter-device>] [--renderer-urls <urls>] [--debug] [--fake-http10-content-length]
     pulseaudio-dlna [-h | --help | --version]
 
 Options:
        --host=<host>                       Set the server ip.
     -p --port=<port>                       Set the server port [default: 8080].
-    -e --encoder=<encoder>                 Set the audio encoder [default: lame].
+    -e --encoder=<encoder>                 Set the audio encoder.
                                            Possible encoders are:
-                                             - lame  MPEG Audio Layer III (MP3)
+                                             - mp3   MPEG Audio Layer III (MP3)
                                              - ogg   Ogg Vorbis
                                              - flac  Free Lossless Audio Codec (FLAC)
                                              - wav   Waveform Audio File Format (WAV)
                                              - opus  Opus Interactive Audio Codec (OPUS)
+    -b --bit-rate=<rate>                   Set the audio encoder's bitrate.
     --filter-device=<filter-device>        Set a name filter for devices which should be added.
                                            Devices which get discovered, but won't match the
                                            filter text will be skipped.
     --renderer-urls=<urls>                 Set the renderer urls yourself. no discovery will commence.
     --debug                                enables detailed debug messages.
+    --fake-http10-content-length           If set, the content-length of HTTP 1.0 requests will be set to 100 GB.
     -v --version                           Show the version.
     -h --help                              Show the help.
 '''
 
 from __future__ import unicode_literals
 
-import gobject
-import dbus
-import dbus.mainloop.glib
-import multiprocessing
-import setproctitle
-import logging
 import sys
-import signal
-import socket
-
+import os
 import docopt
-import pulseaudio_dlna
-import upnp.discover
-import upnp.server
-import upnp.renderer
-import pulseaudio
-import utils.network
-
-
-class PulseAudioDLNA(object):
-    def __init__(self):
-        self.dlna_server = None
-        self.pulse = None
-        self.renderers = []
-
-    def shutdown(self, signal_number=None, frame=None):
-        print('Application is shutting down.')
-        if self.pulse is not None:
-            self.pulse.cleanup()
-        if self.dlna_server is not None:
-            self.dlna_server.server_close()
-        sys.exit(1)
-
-    def startup(self):
-        options = docopt.docopt(__doc__, version=pulseaudio_dlna.__version__)
-
-        if not options['--debug']:
-            logging.basicConfig(level=logging.INFO)
-        else:
-            logging.basicConfig(level=logging.DEBUG)
-
-        if not options['--host']:
-            host = utils.network.default_ipv4()
-            if host is None:
-                print('I could not determiate your host address. '
-                      'You must specify it yourself via the --host option!')
-                sys.exit(1)
-        else:
-            host = str(options['--host'])
-
-        port = int(options['--port'])
-
-        print('Using localhost: {host}:{port}'.format(
-            host=host, port=port))
-
-        if options['--renderer-urls']:
-            for url in options['--renderer-urls'].split(','):
-                renderer = upnp.renderer.UpnpMediaRendererFactory.from_url(
-                    url, upnp.renderer.CoinedUpnpMediaRenderer)
-                if renderer is not None:
-                    self.renderers.append(renderer)
-        else:
-            device_filter = None
-            if options['--filter-device']:
-                device_filter = options['--filter-device'].split(',')
-            dlna_discover = upnp.discover.UpnpMediaRendererDiscover(
-                device_filter=device_filter)
-            dlna_discover.search()
-            self.renderers = dlna_discover.renderers
-            logging.info('Discovery complete.')
-
-        if len(self.renderers) == 0:
-            print('There were no upnp devices found. Application terminates.')
-            sys.exit(1)
-        else:
-            logging.info('Found devices:')
-            for upnp_device in self.renderers:
-                print(upnp_device)
-            logging.info('You can now use your upnp devices!')
-
-        try:
-            self.dlna_server = upnp.server.ThreadedDlnaServer(
-                host, port, encoder=options['--encoder'])
-        except socket.error:
-            print('The dlna server could not bind to your specified port '
-                  '({port}). Perhaps this is already in use? Application '
-                  'terminates.'.format(port=port))
-            sys.exit(1)
-
-        server_url = self.dlna_server.get_server_url()
-        upnp_devices = []
-        for upnp_device in self.renderers:
-            upnp_device.set_server_url(server_url)
-            upnp_devices.append(upnp_device)
-
-        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
-        self.pulse = pulseaudio.PulseWatcher()
-        self.pulse.set_upnp_devices(upnp_devices)
-
-        self.dlna_server.set_bridges(self.pulse.bridges)
-        process = multiprocessing.Process(target=self.dlna_server.serve_forever)
-        process.start()
-
-        setproctitle.setproctitle('pulseaudio-dlna')
-        signal.signal(signal.SIGINT, self.shutdown)
-        signal.signal(signal.SIGTERM, self.shutdown)
-        try:
-            mainloop = gobject.MainLoop()
-            mainloop.run()
-        except KeyboardInterrupt:
-            process.terminate()
-            pass
+import logging
 
 
 def main(argv=sys.argv[1:]):
-    pulseaudio_dlna = PulseAudioDLNA()
-    pulseaudio_dlna.startup()
 
+    import pulseaudio_dlna
+    options = docopt.docopt(__doc__, version=pulseaudio_dlna.__version__)
+
+    level = logging.DEBUG
+    if not options['--debug']:
+        level = logging.INFO
+        logging.getLogger('requests').setLevel(logging.WARNING)
+        logging.getLogger('urllib3').setLevel(logging.WARNING)
+
+    logging.basicConfig(
+        level=level,
+        format='%(asctime)s %(name)-46s %(levelname)-8s %(message)s',
+        datefmt='%m-%d %H:%M:%S')
+    logger = logging.getLogger('pulseaudio_dlna.__main__')
+
+    if os.geteuid() == 0:
+        logger.info('Running as root. Starting daemon ...')
+        import pulseaudio_dlna.daemon
+        daemon = pulseaudio_dlna.daemon.Daemon()
+        daemon.run()
+    else:
+        import pulseaudio_dlna.application
+        app = pulseaudio_dlna.application.Application()
+        app.run(options)
 
 if __name__ == "__main__":
     sys.exit(main())

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/application.py Added

@@ -0,0 +1,166 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import dbus
+import dbus.mainloop.glib
+import multiprocessing
+import signal
+import setproctitle
+import logging
+import sys
+import socket
+
+import pulseaudio_dlna
+import pulseaudio_dlna.common
+import pulseaudio_dlna.listener
+import pulseaudio_dlna.plugins.upnp
+import pulseaudio_dlna.plugins.chromecast
+import pulseaudio_dlna.encoders
+import pulseaudio_dlna.streamserver
+import pulseaudio_dlna.pulseaudio
+import pulseaudio_dlna.utils.network
+
+logger = logging.getLogger('pulseaudio_dlna.application')
+
+
+class Application(object):
+    def __init__(self):
+        self.processes = []
+
+    def shutdown(self, signal_number=None, frame=None):
+        print('Application is shutting down.')
+        for process in self.processes:
+            if process is not None and process.is_alive():
+                process.terminate()
+        sys.exit(0)
+
+    def run_process(self, target):
+        process = multiprocessing.Process(target=target)
+        self.processes.append(process)
+        process.start()
+
+    def run(self, options):
+
+        if not options['--host']:
+            host = pulseaudio_dlna.utils.network.default_ipv4()
+            if host is None:
+                logger.info(
+                    'I could not determine your host address. '
+                    'You must specify it yourself via the --host option!')
+                sys.exit(1)
+        else:
+            host = str(options['--host'])
+
+        port = int(options['--port'])
+
+        logger.info('Using localhost: {host}:{port}'.format(
+            host=host, port=port))
+
+        plugins = [
+            pulseaudio_dlna.plugins.upnp.DLNAPlugin(),
+            pulseaudio_dlna.plugins.chromecast.ChromecastPlugin(),
+        ]
+
+        if options['--encoder']:
+            for encoder in pulseaudio_dlna.common.supported_encoders:
+                if encoder.suffix == options['--encoder']:
+                    pulseaudio_dlna.common.supported_encoders = [encoder]
+                    break
+            if len(pulseaudio_dlna.common.supported_encoders) != 1:
+                logger.error('You specified an unknown encoder! '
+                             'Application terminates.')
+                sys.exit(1)
+
+        if options['--bit-rate']:
+            for encoder in pulseaudio_dlna.common.supported_encoders:
+                try:
+                    encoder.bit_rate = options['--bit-rate']
+                except pulseaudio_dlna.encoders.UnsupportedBitrateException:
+                    if len(encoder.bit_rates) > 0:
+                        logger.error(
+                            'You specified an invalid bit rate '
+                            'for the encoder! Supported bit rates '
+                            'are "{bit_rates}"! '
+                            'Application terminates.'.format(
+                                bit_rates=','.join(
+                                    str(e) for e in encoder.bit_rates)))
+                    else:
+                        logger.error('You selected encoder does not support '
+                                     'setting a specific bit rate! '
+                                     'Application terminates.')
+                    sys.exit(1)
+
+        logger.info('Loaded encoders:')
+        for encoder in pulseaudio_dlna.common.supported_encoders:
+            encoder.validate()
+            logger.info(encoder)
+
+        manager = multiprocessing.Manager()
+        message_queue = multiprocessing.Queue()
+        bridges = manager.list()
+
+        fake_http10_content_length = False
+        if options['--fake-http10-content-length']:
+            fake_http10_content_length = True
+
+        try:
+            stream_server = pulseaudio_dlna.streamserver.ThreadedStreamServer(
+                host, port, bridges, message_queue,
+                fake_http10_content_length=fake_http10_content_length,
+            )
+        except socket.error:
+            logger.error(
+                'The streaming server could not bind to your specified port '
+                '({port}). Perhaps this is already in use? Application '
+                'terminates.'.format(port=port))
+            sys.exit(1)
+
+        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+        pulse = pulseaudio_dlna.pulseaudio.PulseWatcher(bridges, message_queue)
+
+        device_filter = None
+        if options['--filter-device']:
+            device_filter = options['--filter-device'].split(',')
+
+        locations = None
+        if options['--renderer-urls']:
+            locations = options['--renderer-urls'].split(',')
+
+        try:
+            stream_server_address = stream_server.ip, stream_server.port
+            ssdp_listener = pulseaudio_dlna.listener.ThreadedSSDPListener(
+                stream_server_address, message_queue, plugins,
+                device_filter, locations)
+        except socket.error:
+            logger.error(
+                'The SSDP listener could not bind to the port 1900/UDP. '
+                'Perhaps this is already in use? Application terminates.')
+            sys.exit(1)
+
+        self.run_process(target=pulse.run)
+        self.run_process(target=stream_server.run)
+        self.run_process(target=ssdp_listener.run)
+
+        setproctitle.setproctitle('pulseaudio-dlna')
+        signal.signal(signal.SIGINT, self.shutdown)
+        signal.signal(signal.SIGTERM, self.shutdown)
+        signal.signal(signal.SIGHUP, self.shutdown)
+
+        for process in self.processes:
+            process.join()

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/common.py Added

@@ -0,0 +1,47 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import inspect
+
+import encoders
+
+supported_encoders = []
+
+
+def load_encoders():
+    for (name, _type) in inspect.getmembers(encoders):
+        forbidden_members = [
+            '__builtins__',
+            '__doc__',
+            '__file__',
+            '__name__',
+            '__package__',
+            'unicode_literals'
+        ]
+        if name not in forbidden_members:
+            try:
+                encoder = _type()
+            except:
+                continue
+            if name != 'BaseEncoder' and \
+               isinstance(_type(), encoders.BaseEncoder):
+                supported_encoders.append(encoder)
+    supported_encoders.sort(reverse=True)
+
+load_encoders()

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/daemon.py Added

@@ -0,0 +1,214 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import dbus
+import dbus.mainloop.glib
+import logging
+import os
+import sys
+import psutil
+import gobject
+import setproctitle
+import functools
+import signal
+
+import pulseaudio_dlna.utils.subprocess
+
+logger = logging.getLogger('pulseaudio_dlna.daemon')
+
+
+class Daemon(object):
+    def __init__(self):
+        dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+        setproctitle.setproctitle('pulseaudio-daemon')
+        self.mainloop = gobject.MainLoop()
+        self.processes = []
+        self.check_id = None
+        self.is_checking = False
+
+        self._check_processes()
+
+        signals = (
+            ('NameOwnerChanged', 'org.freedesktop.DBus.{}',
+                self.on_name_owner_changed),
+        )
+        self.bus = dbus.SystemBus()
+        self.core = self.bus.get_object('org.freedesktop.DBus', '/')
+        for sig_name, interface, sig_handler in signals:
+            self.bus.add_signal_receiver(sig_handler, sig_name)
+
+    def shutdown(self, signal_number=None, frame=None):
+        logger.info('Daemon.shutdown')
+        for proc in self.processes:
+            if proc.is_attached:
+                proc.detach()
+        self.processes = []
+
+    def on_name_owner_changed(self, name, new_owner, old_owner):
+        if not self.is_checking:
+            if self.check_id:
+                gobject.source_remove(self.check_id)
+            self.check_id = gobject.timeout_add(
+                3000, self._check_processes)
+
+    def _check_processes(self):
+        self.is_checking = True
+        self.check_id = None
+        logger.info('Checking pulseaudio processes ...')
+
+        procs = PulseAudioFinder.get_processes()
+        for proc in procs:
+            if proc not in self.processes:
+                logger.info('Adding pulseaudio process ({})'.format(proc.pid))
+                self.processes.append(proc)
+
+        gone, alive = psutil.wait_procs(self.processes, timeout=2)
+        for proc in gone:
+            if proc.is_attached:
+                proc.detach()
+            logger.info('Removing pulseaudio process ({})'.format(proc.pid))
+            self.processes.remove(proc)
+        for proc in alive:
+            if not proc.is_attached:
+                proc.attach()
+
+        self.is_checking = False
+        return False
+
+    def run(self):
+        try:
+            self.mainloop.run()
+        except KeyboardInterrupt:
+            self.shutdown()
+
+
+@functools.total_ordering
+class PulseAudioProcess(psutil.Process):
+    def __init__(self, *args, **kwargs):
+        psutil.Process.__init__(*args, **kwargs)
+        self.application = None
+
+    @property
+    def env(self):
+        return self._get_proc_env(self.pid)
+
+    @property
+    def uid(self):
+        return self.uids[0]
+
+    @property
+    def gid(self):
+        return self.gids[0]
+
+    @property
+    def is_attached(self):
+        if self.application:
+            if self.application.poll() is None:
+                return True
+        return False
+
+    def attach(self):
+        logger.info('Attaching application to pulseaudio ({pid})'.format(
+            pid=self.pid))
+
+        proc_env = self.env
+        if not proc_env:
+            logger.error(
+                'Could not get the environment of pulseaudio ({pid}). '
+                'Aborting.'.format(pid=self.pid))
+            return
+
+        required_variables = [
+            'DISPLAY',
+            'DBUS_SESSION_BUS_ADDRESS',
+            'PATH',
+            'XDG_RUNTIME_DIR'
+        ]
+        compressed_env = {}
+        for k in required_variables:
+            compressed_env[k] = proc_env[k]
+
+        self.application = (
+            pulseaudio_dlna.utils.subprocess.GobjectSubprocess(
+                sys.argv,
+                uid=self.uid,
+                gid=self.gid,
+                env=compressed_env,
+                cwd=os.getcwd()))
+
+    def detach(self):
+        app_pid = self.application.pid
+        if app_pid:
+            logger.info('Detaching application ({app_pid}) from '
+                        'pulseaudio ({pid})'.format(
+                            pid=self.pid, app_pid=app_pid))
+            self._kill_process_tree(app_pid)
+            self.application = None
+
+    def _kill_process_tree(self, pid, timeout=3):
+        try:
+            p = psutil.Process(pid)
+            for child in p.get_children():
+                self._kill_process_tree(child.pid)
+            p.send_signal(signal.SIGINT)
+            p.wait(timeout=timeout)
+        except psutil._error.TimeoutExpired:
+            logger.info(
+                'Process {} did not exit, sending SIGKILL ...'.format(pid))
+            p.kill()
+        except psutil._error.NoSuchProcess:
+            logger.info('Process {} has exited.'.format(pid))
+
+    def _get_proc_env(self, pid):
+        env = {}
+        location = '/proc/{pid}/environ'.format(pid=pid)
+        try:
+            with open(location) as f:
+                content = f.read()
+            for line in content.split('\0'):
+                try:
+                    key, value = line.split('=', 1)
+                    env[key] = value
+                except ValueError:
+                    pass
+            return env
+        except IOError:
+            return None
+
+    def __eq__(self, other):
+        return self.pid == other.pid
+
+    def __gt__(self, other):
+        return self.pid > other.pid
+
+
+class PulseAudioFinder(object):
+    @staticmethod
+    def get_processes():
+        processes = []
+        try:
+            for proc in psutil.process_iter():
+                if proc.name == 'pulseaudio':
+                    proc.__class__ = PulseAudioProcess
+                    if not hasattr(proc, 'application'):
+                        proc.application = None
+                    processes.append(proc)
+        except psutil._error.NoSuchProcess:
+            pass
+        return processes

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/discover.py Added

@@ -0,0 +1,70 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import socket as s
+import logging
+import time
+
+logger = logging.getLogger('pulseaudio_dlna.discover')
+
+
+class BaseUpnpMediaRendererDiscover(object):
+
+    SSDP_ADDRESS = '239.255.255.250'
+    SSDP_PORT = 1900
+
+    MSEARCH = 'M-SEARCH * HTTP/1.1\r\n' + \
+              'HOST: {}:{}\r\n'.format(SSDP_ADDRESS, SSDP_PORT) + \
+              'MAN: "ssdp:discover"\r\n' + \
+              'MX: 2\r\n' + \
+              'ST: ssdp:all\r\n\r\n'
+
+    def search(self, ttl=10, timeout=5, times=4):
+        s.setdefaulttimeout(timeout)
+        sock = s.socket(s.AF_INET, s.SOCK_DGRAM, s.IPPROTO_UDP)
+        sock.setsockopt(s.IPPROTO_IP, s.IP_MULTICAST_TTL, ttl)
+
+        for i in range(0, times):
+            sock.sendto(self.MSEARCH, (self.SSDP_ADDRESS, self.SSDP_PORT))
+            time.sleep(0.1)
+
+        buffer_size = 1024
+        while True:
+            try:
+                header, address = sock.recvfrom(buffer_size)
+                self._header_received(header, address)
+            except s.timeout:
+                break
+        sock.close()
+
+    def _header_received(self, header, address):
+        pass
+
+
+class RendererDiscover(BaseUpnpMediaRendererDiscover):
+
+    def __init__(self, renderer_holder):
+        self.renderer_holder = renderer_holder
+
+    def search(self, ttl=10, timeout=5, times=2):
+        self.renderers = []
+        BaseUpnpMediaRendererDiscover.search(self, ttl, timeout, times)
+
+    def _header_received(self, header, address):
+        self.renderer_holder.add_from_search(header)

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/encoders.py Added

@@ -0,0 +1,271 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import functools
+import distutils.spawn
+
+
+class UnsupportedBitrateException():
+    pass
+
+
+class UnsupportedMimeTypeException():
+    pass
+
+
+@functools.total_ordering
+class BaseEncoder(object):
+    def __init__(self):
+        self._binary = None
+        self._command = ''
+        self._mime_type = 'undefined'
+        self._mime_types = []
+        self._suffix = 'undefined'
+        self._bit_rate = None
+        self._bit_rates = []
+        self._priority = 0
+        self._state = False
+        self._enabled = False
+
+    @property
+    def binary(self):
+        return self._binary
+
+    @property
+    def command(self):
+        return self._command.format(binary=self.binary)
+
+    @property
+    def mime_type(self):
+        return self._mime_type
+
+    @mime_type.setter
+    def mime_type(self, value):
+        if value in self._mime_types:
+            self._mime_type = value
+        else:
+            raise UnsupportedMimeTypeException()
+
+    @property
+    def mime_types(self):
+        return self._mime_types
+
+    @property
+    def suffix(self):
+        return self._suffix
+
+    @property
+    def bit_rate(self):
+        return self._bit_rate
+
+    @bit_rate.setter
+    def bit_rate(self, value):
+        if int(value) in self.bit_rates:
+            self._bit_rate = value
+        else:
+            raise UnsupportedBitrateException()
+
+    @property
+    def bit_rates(self):
+        return self._bit_rates
+
+    @property
+    def priority(self):
+        return self._priority
+
+    @property
+    def state(self):
+        if self._enabled:
+            return self._state
+        return False
+
+    @property
+    def enabled(self):
+        return self._enabled
+
+    @enabled.setter
+    def enabled(self, value):
+        self._enabled = value
+
+    def validate(self):
+        result = distutils.spawn.find_executable(self.binary)
+        if result is not None and result.endswith(self.binary):
+            self._state = True
+        return self._state
+
+    def __eq__(self, other):
+        return self.priority == other.priority
+
+    def __gt__(self, other):
+        return self.priority > other.priority
+
+    def __str__(self):
+        return '<{} bit-rate="{}" state="{}" enabled="{}" mime-types="{}">'.format(
+            self.__class__.__name__,
+            unicode(self.bit_rate),
+            unicode(self.state),
+            unicode(self.enabled),
+            ','.join(self.mime_types),
+        )
+
+
+class WavEncoder(BaseEncoder):
+    def __init__(self):
+        BaseEncoder.__init__(self)
+        self._binary = 'sox'
+        self._command = ('{binary} -t raw -b 16 -e signed -c 2 -r 44100 - -t wav '
+                         '-r 44100 -b 16 -L -e signed -c 2 -')
+        self._mime_type = 'audio/wav'
+        self._suffix = 'wav'
+        self._mime_types = ['audio/wav', 'audio/x-wav']
+        self._bit_rate = None
+        self._bit_rates = []
+        self._priority = 18
+        self._enabled = True
+
+    @property
+    def bit_rate(self):
+        return self._bit_rate
+
+    @bit_rate.setter
+    def bit_rate(self, value):
+        raise UnsupportedBitrateException()
+
+
+class LameEncoder(BaseEncoder):
+    def __init__(self):
+        BaseEncoder.__init__(self)
+        self._binary = 'lame'
+        self._command = '{binary} {bit_rate} -r -'
+        self._mime_type = 'audio/mpeg'
+        self._suffix = 'mp3'
+        self._mime_types = ['audio/mpeg', 'audio/mp3']
+        self._bit_rate = 192
+        self._bit_rates = [32, 40, 48, 56, 64, 80, 96, 112,
+                           128, 160, 192, 224, 256, 320]
+        self._priority = 15
+        self._enabled = True
+
+    @property
+    def command(self):
+        if self.bit_rate is None:
+            return self._command.format(binary=self.binary, bit_rate='')
+        else:
+            return self._command.format(
+                binary=self.binary, bit_rate='-b ' + str(self.bit_rate))
+
+
+class AacEncoder(BaseEncoder):
+    def __init__(self):
+        BaseEncoder.__init__(self)
+        self._binary = 'faac'
+        self._command = '{binary} {bit_rate} -X -P -o - -'
+        self._mime_type = 'audio/aac'
+        self._suffix = 'aac'
+        self._mime_types = ['audio/aac', 'audio/x-aac']
+        self._bit_rates = [32, 40, 48, 56, 64, 80, 96, 112,
+                           128, 160, 192, 224, 256, 320]
+        self._bit_rate = 192
+        self._priority = 12
+        self._enabled = True
+
+    @property
+    def command(self):
+        if self.bit_rate is None:
+            return self._command.format(binary=self.binary, bit_rate='')
+        else:
+            return self._command.format(
+                binary=self.binary, bit_rate='-b ' + str(self.bit_rate))
+
+
+class FlacEncoder(BaseEncoder):
+    def __init__(self):
+        BaseEncoder.__init__(self)
+        self._binary = 'flac'
+        self._command = ('{binary} - -c --channels 2 --bps 16 '
+                         '--sample-rate 44100 '
+                         '--endian little --sign signed -s')
+        self._mime_type = 'audio/flac'
+        self._suffix = 'flac'
+        self._mime_types = ['audio/flac', 'audio/x-flac']
+        self._bit_rate = None
+        self._bit_rates = []
+        self._priority = 9
+        self._enabled = True
+
+    @property
+    def bit_rate(self):
+        return self._bit_rate
+
+    @bit_rate.setter
+    def bit_rate(self, value):
+        raise UnsupportedBitrateException()
+
+
+class OggEncoder(BaseEncoder):
+    def __init__(self):
+        BaseEncoder.__init__(self)
+        self._binary = 'oggenc'
+        self._command = '{binary} {bit_rate} -Q -r -k --ignorelength -'
+        self._mime_type = 'audio/ogg'
+        self._suffix = 'ogg'
+        self._mime_types = ['audio/ogg', 'audio/x-ogg', 'application/ogg']
+        self._bit_rate = 192
+        self._priority = 6
+        self._enabled = True
+
+    @property
+    def bit_rate(self):
+        return self._bit_rate
+
+    @bit_rate.setter
+    def bit_rate(self, value):
+        self._bit_rate = int(value)
+
+    @property
+    def command(self):
+        if self.bit_rate is None:
+            return self._command.format(binary=self.binary, bit_rate='')
+        else:
+            return self._command.format(
+                binary=self.binary, bit_rate='-b ' + str(self.bit_rate))
+
+
+class OpusEncoder(BaseEncoder):
+    def __init__(self):
+        BaseEncoder.__init__(self)
+        self._binary = 'opusenc'
+        self._command = ('{binary} {bit_rate} --padding 0 --max-delay 0 '
+                         '--expect-loss 1 --framesize 2.5 --raw-rate 44100 '
+                         '--raw --bitrate 64 - -')
+        self._mime_type = 'audio/opus'
+        self._suffix = 'opus'
+        self._mime_types = ['audio/opus', 'audio/x-opus']
+        self._bit_rate = 192
+        self._bit_rates = [i for i in range(6, 257)]
+        self._priority = 3
+        self._enabled = True
+
+    @property
+    def command(self):
+        if self.bit_rate is None:
+            return self._command.format(binary=self.binary, bit_rate='')
+        else:
+            return self._command.format(
+                binary=self.binary, bit_rate='--bitrate ' + str(self.bit_rate))

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/listener.py Added

@@ -0,0 +1,71 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import SocketServer
+import logging
+import socket
+import struct
+import setproctitle
+from pulseaudio_dlna.discover import RendererDiscover
+from pulseaudio_dlna.renderers import RendererHolder
+
+logger = logging.getLogger('pulseaudio_dlna.listener')
+
+
+class SSDPRequestHandler(SocketServer.BaseRequestHandler):
+    def handle(self):
+        packet = self.request[0]
+        lines = packet.splitlines()
+        if len(lines) > 0 and self._is_notify_method(lines[0]):
+            self.server.renderers_holder.process_notify_request(packet)
+
+    def _is_notify_method(self, method_header):
+        method = self._get_method(method_header)
+        return method == 'NOTIFY'
+
+    def _get_method(self, method_header):
+        return method_header.split(' ')[0]
+
+
+class SSDPListener(SocketServer.UDPServer):
+    def __init__(
+            self, stream_server_address, message_queue, plugins,
+            device_filter=None, renderer_urls=None):
+        SocketServer.UDPServer.__init__(self, ('', 1900), SSDPRequestHandler)
+        multicast = struct.pack(
+            "=4sl", socket.inet_aton("239.255.255.250"), socket.INADDR_ANY)
+        self.socket.setsockopt(
+            socket.IPPROTO_IP, socket.IP_ADD_MEMBERSHIP, multicast)
+        self.renderers_holder = RendererHolder(
+            stream_server_address, message_queue, plugins, device_filter)
+        self.renderer_urls = renderer_urls
+
+    def run(self):
+        setproctitle.setproctitle('ssdp_listener')
+        if self.renderer_urls is not None:
+            self.renderers_holder.add_renderers_by_url(self.renderer_urls)
+        else:
+            discover = RendererDiscover(self.renderers_holder)
+            discover.search()
+            logger.info('Discovery complete.')
+        SocketServer.UDPServer.serve_forever(self)
+
+
+class ThreadedSSDPListener(SocketServer.ThreadingMixIn, SSDPListener):
+    pass

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/notification.py Added

@@ -0,0 +1,39 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import logging
+
+import notify2
+
+logger = logging.getLogger('pulseaudio_dlna.notification')
+
+
+def show(title, message, icon=''):
+    try:
+        notice = notify2.Notification(title, message, icon)
+        notice.set_timeout(notify2.EXPIRES_DEFAULT)
+        notice.show()
+    except:
+        logger.info(
+            'notify2 failed to display: {title} - {message}'.format(
+                title=title,
+                message=message))
+
+
+notify2.init('pulseaudio_dlna')

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins Added

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/__init__.py Added

@@ -0,0 +1,32 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+
+class BasePlugin(object):
+    def __init__(self):
+        self.st_header = None
+
+    def discover(self):
+        raise NotImplementedError()
+
+    def lookup(self, locations):
+        raise NotImplementedError()
+
+    def create_device(self, header):
+        raise NotImplementedError()

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/chromecast Added

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/chromecast/__init__.py Added

@@ -0,0 +1,41 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import pulseaudio_dlna.plugins
+import pulseaudio_dlna.plugins.chromecast.renderer
+
+
+class ChromecastPlugin(pulseaudio_dlna.plugins.BasePlugin):
+    def __init__(self, *args):
+        pulseaudio_dlna.plugins.BasePlugin.__init__(self, *args)
+        self.st_header = 'urn:dial-multiscreen-org:service:dial:1'
+
+    def lookup(self, locations):
+        renderers = []
+        for url in locations:
+            renderer = pulseaudio_dlna.plugins.chromecast.renderer.ChromecastRendererFactory.from_url(
+                url, pulseaudio_dlna.plugins.chromecast.renderer.CoinedChromecastRenderer)
+            if renderer is not None:
+                renderers.append(renderer)
+        return renderers
+
+    def create_device(self, header):
+        return pulseaudio_dlna.plugins.chromecast.renderer.ChromecastRendererFactory.from_header(
+            header,
+            pulseaudio_dlna.plugins.chromecast.renderer.CoinedChromecastRenderer)

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/chromecast/pycastv2 Added

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/chromecast/pycastv2/__init__.py Added

@@ -0,0 +1,283 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import time
+import logging
+
+import commands
+import cast_socket
+
+logger = logging.getLogger('pycastv2')
+
+
+class ChannelClosedException(Exception):
+    pass
+
+
+class ChannelController(object):
+    def __init__(self, socket):
+        self.request_id = 1
+        self.transport_id = 'receiver-0'
+        self.session_id = None
+        self.app_id = None
+
+        self.channels = []
+
+        self.socket = socket
+        self.socket.add_send_listener(self._handle_send)
+        self.socket.add_read_listener(self._handle_response)
+        self.socket.send_and_wait(commands.StatusCommand())
+
+    def _get_unused_request_id(self):
+        self.request_id += 1
+        return self.request_id - 1
+
+    def _handle_send(self, command):
+        if command.request_id is not None:
+            command.request_id = (command.request_id or
+                                  self._get_unused_request_id())
+        if command.session_id is not None:
+            command.session_id = command.session_id or self.session_id
+        command.sender_id = command.sender_id or 'sender-0'
+        if command.destination_id is None:
+            command.destination_id = 'receiver-0'
+        else:
+            command.destination_id = (command.destination_id or
+                                      self.transport_id)
+        if not self.is_channel_connected(command.destination_id):
+            self.connect_channel(command.destination_id)
+        return command
+
+    def _handle_response(self, response):
+        if 'type' in response:
+            response_type = response['type']
+            if response_type == 'RECEIVER_STATUS':
+                if 'applications' in response['status']:
+                    applications = response['status']['applications'][0]
+                    self.transport_id = (
+                        applications.get('transportId') or self.transport_id)
+                    self.session_id = (
+                        applications.get('sessionId') or self.session_id)
+                    self.app_id = (
+                        applications.get('appId') or self.app_id)
+            elif response_type == 'PING':
+                self.socket.send(commands.PongCommand())
+            elif response_type == 'CLOSE':
+                raise ChannelClosedException()
+
+    def is_channel_connected(self, destination_id):
+        return destination_id in self.channels
+
+    def connect_channel(self, destination_id):
+        self.channels.append(destination_id)
+        self.socket.send(commands.ConnectCommand(destination_id))
+
+    def disconnect_channel(self, destination_id):
+        self.socket.send(commands.CloseCommand(destination_id))
+        self.channels.remove(destination_id)
+
+    def __str__(self):
+        return ('<ChannelController>\n'
+                '  request_id: {request_id}\n'
+                '  transport_id: {transport_id}\n'
+                '  session_id: {session_id}\n'
+                '  app_id: {app_id}'.format(
+                    request_id=self.request_id,
+                    transport_id=self.transport_id,
+                    session_id=self.session_id,
+                    app_id=self.app_id))
+
+
+class ChromecastController():
+
+    APP_BACKDROP = 'E8C28D3C'
+
+    def __init__(self, ip, max_retries=15):
+        self.max_retries = max_retries
+        self.socket = cast_socket.CastSocket(ip)
+        self.channel_controller = ChannelController(self.socket)
+
+    def is_app_running(self, app_id):
+        if self.channel_controller.app_id is None:
+            return False
+        return self.channel_controller.app_id == app_id
+
+    def launch_application(self, app_id):
+        if not self.is_app_running(app_id):
+            self.socket.send(commands.LaunchCommand(app_id))
+            retries = 0
+            while not self.is_app_running(app_id):
+                if retries > self.max_retries:
+                    return False
+                self.socket.send_and_wait(commands.StatusCommand())
+                time.sleep(1)
+                retries += 1
+            return True
+        else:
+            logger.debug('Starting not necessary. Application is running ...')
+            return True
+
+    def stop_application(self):
+        if not self.is_app_running(self.APP_BACKDROP):
+            self.socket.send(commands.StopCommand())
+            retries = 0
+            while not self.is_app_running(self.APP_BACKDROP):
+                if retries > self.max_retries:
+                    return False
+                self.socket.send_and_wait(commands.StatusCommand())
+                time.sleep(1)
+                retries += 1
+            return True
+        else:
+            logger.debug('Stop not necessary. Backdrop is running ...')
+            return True
+
+    def disconnect_application(self):
+        if not self.is_app_running(self.APP_BACKDROP):
+            self.socket.send(commands.CloseCommand(destination_id=False))
+            try:
+                retries = 0
+                while not self.is_app_running(self.APP_BACKDROP):
+                    if retries > self.max_retries:
+                        return False
+                    self.socket.send_and_wait(commands.StatusCommand())
+                    time.sleep(1)
+                    retries += 1
+                return True
+            except ChannelClosedException:
+                logger.info('Connection was closed. I guess another '
+                            'client has attached to it.')
+                return True
+        else:
+            logger.debug('Closing not necessary. Backdrop is running ...')
+            return True
+
+    def wait(self, timeout):
+        self.socket.wait(timeout)
+
+    def cleanup(self):
+        self.socket.close()
+
+
+class LoadCommand(commands.BaseCommand):
+    def __init__(self, url, mime_type, title=None, thumb=None,
+                 session_id=None, destination_id=None, namespace=None):
+        commands.BaseCommand.__init__(self)
+        custom_data = {}
+        if title or thumb:
+            custom_data = {
+                'payload': {
+                    'title': title,
+                    'thumb': thumb,
+                }
+            }
+        self.data = {
+            'autoplay': True,
+            'currentTime': 0,
+            'customData': custom_data,
+            'media': {'contentId': url,
+                      'contentType': mime_type,
+                      'streamType': 'BUFFERED'},
+            'type': 'LOAD'
+        }
+        self.request_id = False
+        self.session_id = False
+        self.destination_id = destination_id
+        self.namespace = namespace or 'urn:x-cast:com.google.cast.media'
+
+
+class LoadFailedException(Exception):
+    pass
+
+
+class MediaPlayerController(ChromecastController):
+
+    APP_MEDIA_PLAYER = 'CC1AD845'
+
+    PLAYER_STATE_BUFFERING = 'BUFFERING'
+    PLAYER_STATE_PLAYING = 'PLAYING'
+    PLAYER_STATE_PAUSED = 'PAUSED'
+    PLAYER_STATE_IDLE = 'IDLE'
+
+    def __init__(self, ip):
+        ChromecastController.__init__(self, ip)
+        self.media_session_id = None
+        self.current_time = None
+        self.media = None
+        self.playback_rate = None
+        self.volume = None
+        self.player_state = None
+
+        self.socket.add_read_listener(self._handle_response)
+
+    def launch(self):
+        self.launch_application(self.APP_MEDIA_PLAYER)
+
+    def load(self, url, mime_type, title=None, thumb=None):
+        self.launch()
+        try:
+            self.socket.send_and_wait(
+                LoadCommand(
+                    url, mime_type, title, thumb, destination_id=False))
+            return True
+        except (cast_socket.NoResponseException, LoadFailedException):
+            return False
+
+    def _update_attribute(self, name, value):
+        if value is not None:
+            setattr(self, name, value)
+
+    def _handle_response(self, response):
+        if 'type' in response:
+            if response['type'] == 'MEDIA_STATUS':
+                logger.debug('Recieved media status ...')
+                status = response['status'][0]
+                self._update_attribute(
+                    'media_session_id', status.get('mediaSessionId', None))
+                self._update_attribute(
+                    'current_time', status.get('currentTime', None))
+                self._update_attribute(
+                    'media', status.get('media', None))
+                self._update_attribute(
+                    'playback_rate', status.get('playbackRate', None))
+                self._update_attribute(
+                    'volume', status.get('volume', None))
+                self._update_attribute(
+                    'player_state', status.get('playerState', None))
+            elif response['type'] == 'LOAD_FAILED':
+                raise LoadFailedException()
+
+    @property
+    def player_state(self):
+        return self.player_state
+
+    @property
+    def is_playing(self):
+        return (self.player_state is not None and
+                self.player_state == self.PLAYER_STATE_PLAYING)
+
+    @property
+    def is_paused(self):
+        return (self.player_state is not None and
+                self.player_state == self.PLAYER_STATE_PAUSED)
+
+    @property
+    def is_idle(self):
+        return (self.player_state is not None and
+                self.player_state == self.PLAYER_STATE_IDLE)

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/chromecast/pycastv2/cast_channel_pb2.py Added

@@ -0,0 +1,326 @@
+# Generated by the protocol buffer compiler.  DO NOT EDIT!
+# source: cast_channel.proto
+
+from google.protobuf import descriptor as _descriptor
+from google.protobuf import message as _message
+from google.protobuf import reflection as _reflection
+from google.protobuf import descriptor_pb2
+# @@protoc_insertion_point(imports)
+
+
+
+
+DESCRIPTOR = _descriptor.FileDescriptor(
+  name='cast_channel.proto',
+  package='extensions.api.cast_channel',
+  serialized_pb='\n\x12\x63\x61st_channel.proto\x12\x1b\x65xtensions.api.cast_channel\"\xe3\x02\n\x0b\x43\x61stMessage\x12R\n\x10protocol_version\x18\x01 \x02(\x0e\x32\x38.extensions.api.cast_channel.CastMessage.ProtocolVersion\x12\x11\n\tsource_id\x18\x02 \x02(\t\x12\x16\n\x0e\x64\x65stination_id\x18\x03 \x02(\t\x12\x11\n\tnamespace\x18\x04 \x02(\t\x12J\n\x0cpayload_type\x18\x05 \x02(\x0e\x32\x34.extensions.api.cast_channel.CastMessage.PayloadType\x12\x14\n\x0cpayload_utf8\x18\x06 \x01(\t\x12\x16\n\x0epayload_binary\x18\x07 \x01(\x0c\"!\n\x0fProtocolVersion\x12\x0e\n\nCASTV2_1_0\x10\x00\"%\n\x0bPayloadType\x12\n\n\x06STRING\x10\x00\x12\n\n\x06\x42INARY\x10\x01\"\x0f\n\rAuthChallenge\"B\n\x0c\x41uthResponse\x12\x11\n\tsignature\x18\x01 \x02(\x0c\x12\x1f\n\x17\x63lient_auth_certificate\x18\x02 \x02(\x0c\"~\n\tAuthError\x12\x44\n\nerror_type\x18\x01 \x02(\x0e\x32\x30.extensions.api.cast_channel.AuthError.ErrorType\"+\n\tErrorType\x12\x12\n\x0eINTERNAL_ERROR\x10\x00\x12\n\n\x06NO_TLS\x10\x01\"\xc6\x01\n\x11\x44\x65viceAuthMessage\x12=\n\tchallenge\x18\x01 \x01(\x0b\x32*.extensions.api.cast_channel.AuthChallenge\x12;\n\x08response\x18\x02 \x01(\x0b\x32).extensions.api.cast_channel.AuthResponse\x12\x35\n\x05\x65rror\x18\x03 \x01(\x0b\x32&.extensions.api.cast_channel.AuthErrorB\x02H\x03')
+
+
+
+_CASTMESSAGE_PROTOCOLVERSION = _descriptor.EnumDescriptor(
+  name='ProtocolVersion',
+  full_name='extensions.api.cast_channel.CastMessage.ProtocolVersion',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='CASTV2_1_0', index=0, number=0,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=335,
+  serialized_end=368,
+)
+
+_CASTMESSAGE_PAYLOADTYPE = _descriptor.EnumDescriptor(
+  name='PayloadType',
+  full_name='extensions.api.cast_channel.CastMessage.PayloadType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='STRING', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='BINARY', index=1, number=1,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=370,
+  serialized_end=407,
+)
+
+_AUTHERROR_ERRORTYPE = _descriptor.EnumDescriptor(
+  name='ErrorType',
+  full_name='extensions.api.cast_channel.AuthError.ErrorType',
+  filename=None,
+  file=DESCRIPTOR,
+  values=[
+    _descriptor.EnumValueDescriptor(
+      name='INTERNAL_ERROR', index=0, number=0,
+      options=None,
+      type=None),
+    _descriptor.EnumValueDescriptor(
+      name='NO_TLS', index=1, number=1,
+      options=None,
+      type=None),
+  ],
+  containing_type=None,
+  options=None,
+  serialized_start=577,
+  serialized_end=620,
+)
+
+
+_CASTMESSAGE = _descriptor.Descriptor(
+  name='CastMessage',
+  full_name='extensions.api.cast_channel.CastMessage',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='protocol_version', full_name='extensions.api.cast_channel.CastMessage.protocol_version', index=0,
+      number=1, type=14, cpp_type=8, label=2,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='source_id', full_name='extensions.api.cast_channel.CastMessage.source_id', index=1,
+      number=2, type=9, cpp_type=9, label=2,
+      has_default_value=False, default_value=unicode("", "utf-8"),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='destination_id', full_name='extensions.api.cast_channel.CastMessage.destination_id', index=2,
+      number=3, type=9, cpp_type=9, label=2,
+      has_default_value=False, default_value=unicode("", "utf-8"),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='namespace', full_name='extensions.api.cast_channel.CastMessage.namespace', index=3,
+      number=4, type=9, cpp_type=9, label=2,
+      has_default_value=False, default_value=unicode("", "utf-8"),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='payload_type', full_name='extensions.api.cast_channel.CastMessage.payload_type', index=4,
+      number=5, type=14, cpp_type=8, label=2,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='payload_utf8', full_name='extensions.api.cast_channel.CastMessage.payload_utf8', index=5,
+      number=6, type=9, cpp_type=9, label=1,
+      has_default_value=False, default_value=unicode("", "utf-8"),
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='payload_binary', full_name='extensions.api.cast_channel.CastMessage.payload_binary', index=6,
+      number=7, type=12, cpp_type=9, label=1,
+      has_default_value=False, default_value="",
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _CASTMESSAGE_PROTOCOLVERSION,
+    _CASTMESSAGE_PAYLOADTYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=52,
+  serialized_end=407,
+)
+
+
+_AUTHCHALLENGE = _descriptor.Descriptor(
+  name='AuthChallenge',
+  full_name='extensions.api.cast_channel.AuthChallenge',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=409,
+  serialized_end=424,
+)
+
+
+_AUTHRESPONSE = _descriptor.Descriptor(
+  name='AuthResponse',
+  full_name='extensions.api.cast_channel.AuthResponse',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='signature', full_name='extensions.api.cast_channel.AuthResponse.signature', index=0,
+      number=1, type=12, cpp_type=9, label=2,
+      has_default_value=False, default_value="",
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='client_auth_certificate', full_name='extensions.api.cast_channel.AuthResponse.client_auth_certificate', index=1,
+      number=2, type=12, cpp_type=9, label=2,
+      has_default_value=False, default_value="",
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=426,
+  serialized_end=492,
+)
+
+
+_AUTHERROR = _descriptor.Descriptor(
+  name='AuthError',
+  full_name='extensions.api.cast_channel.AuthError',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='error_type', full_name='extensions.api.cast_channel.AuthError.error_type', index=0,
+      number=1, type=14, cpp_type=8, label=2,
+      has_default_value=False, default_value=0,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+    _AUTHERROR_ERRORTYPE,
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=494,
+  serialized_end=620,
+)
+
+
+_DEVICEAUTHMESSAGE = _descriptor.Descriptor(
+  name='DeviceAuthMessage',
+  full_name='extensions.api.cast_channel.DeviceAuthMessage',
+  filename=None,
+  file=DESCRIPTOR,
+  containing_type=None,
+  fields=[
+    _descriptor.FieldDescriptor(
+      name='challenge', full_name='extensions.api.cast_channel.DeviceAuthMessage.challenge', index=0,
+      number=1, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='response', full_name='extensions.api.cast_channel.DeviceAuthMessage.response', index=1,
+      number=2, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+    _descriptor.FieldDescriptor(
+      name='error', full_name='extensions.api.cast_channel.DeviceAuthMessage.error', index=2,
+      number=3, type=11, cpp_type=10, label=1,
+      has_default_value=False, default_value=None,
+      message_type=None, enum_type=None, containing_type=None,
+      is_extension=False, extension_scope=None,
+      options=None),
+  ],
+  extensions=[
+  ],
+  nested_types=[],
+  enum_types=[
+  ],
+  options=None,
+  is_extendable=False,
+  extension_ranges=[],
+  serialized_start=623,
+  serialized_end=821,
+)
+
+_CASTMESSAGE.fields_by_name['protocol_version'].enum_type = _CASTMESSAGE_PROTOCOLVERSION
+_CASTMESSAGE.fields_by_name['payload_type'].enum_type = _CASTMESSAGE_PAYLOADTYPE
+_CASTMESSAGE_PROTOCOLVERSION.containing_type = _CASTMESSAGE;
+_CASTMESSAGE_PAYLOADTYPE.containing_type = _CASTMESSAGE;
+_AUTHERROR.fields_by_name['error_type'].enum_type = _AUTHERROR_ERRORTYPE
+_AUTHERROR_ERRORTYPE.containing_type = _AUTHERROR;
+_DEVICEAUTHMESSAGE.fields_by_name['challenge'].message_type = _AUTHCHALLENGE
+_DEVICEAUTHMESSAGE.fields_by_name['response'].message_type = _AUTHRESPONSE
+_DEVICEAUTHMESSAGE.fields_by_name['error'].message_type = _AUTHERROR
+DESCRIPTOR.message_types_by_name['CastMessage'] = _CASTMESSAGE
+DESCRIPTOR.message_types_by_name['AuthChallenge'] = _AUTHCHALLENGE
+DESCRIPTOR.message_types_by_name['AuthResponse'] = _AUTHRESPONSE
+DESCRIPTOR.message_types_by_name['AuthError'] = _AUTHERROR
+DESCRIPTOR.message_types_by_name['DeviceAuthMessage'] = _DEVICEAUTHMESSAGE
+
+class CastMessage(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _CASTMESSAGE
+
+  # @@protoc_insertion_point(class_scope:extensions.api.cast_channel.CastMessage)
+
+class AuthChallenge(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _AUTHCHALLENGE
+
+  # @@protoc_insertion_point(class_scope:extensions.api.cast_channel.AuthChallenge)
+
+class AuthResponse(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _AUTHRESPONSE
+
+  # @@protoc_insertion_point(class_scope:extensions.api.cast_channel.AuthResponse)
+
+class AuthError(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _AUTHERROR
+
+  # @@protoc_insertion_point(class_scope:extensions.api.cast_channel.AuthError)
+
+class DeviceAuthMessage(_message.Message):
+  __metaclass__ = _reflection.GeneratedProtocolMessageType
+  DESCRIPTOR = _DEVICEAUTHMESSAGE
+
+  # @@protoc_insertion_point(class_scope:extensions.api.cast_channel.DeviceAuthMessage)
+
+
+DESCRIPTOR.has_options = True
+DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), 'H\003')
+# @@protoc_insertion_point(module_scope)

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/chromecast/pycastv2/cast_socket.py Added

@@ -0,0 +1,202 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import ssl
+import socket
+import logging
+import struct
+import json
+import time
+import traceback
+import select
+
+import cast_channel_pb2
+
+logger = logging.getLogger('pycastv2.cast_socket')
+
+
+class NoResponseException(Exception):
+    pass
+
+
+class BaseChromecastSocket(object):
+    def __init__(self, ip):
+        self.sock = socket.socket()
+        self.sock = ssl.wrap_socket(self.sock)
+        self.sock.connect((ip, 8009))
+        self.agent = 'chromecast_v2'
+
+    def _generate_message(self,
+                          source_id='sender-0', destination_id='receiver-0',
+                          namespace=None):
+        message = cast_channel_pb2.CastMessage()
+        message.protocol_version = message.CASTV2_1_0
+        message.source_id = source_id
+        message.destination_id = destination_id
+        message.payload_type = cast_channel_pb2.CastMessage.STRING
+        if namespace:
+            message.namespace = namespace
+        return message
+
+    def close(self):
+        self.sock.close()
+        logger.debug('Chromecast socket was cleaned up.')
+
+    def send(self, data, sender_id, destination_id, namespace=None):
+        json_data = json.dumps(data)
+        message = self._generate_message(
+            source_id=sender_id,
+            destination_id=destination_id,
+            namespace=namespace)
+        message.payload_utf8 = json_data
+        size = struct.pack('>I', message.ByteSize())
+        formatted_message = size + message.SerializeToString()
+        self.sock.sendall(formatted_message)
+
+    def read(self):
+        try:
+            data = str('')
+            while len(data) < 4:
+                part = self.sock.recv(1)
+                data += part
+            length = struct.unpack('>I', data)[0]
+            data = str('')
+            while len(data) < length:
+                part = self.sock.recv(2048)
+                data += part
+            message = self._generate_message()
+            message.ParseFromString(data)
+            response = json.loads(message.payload_utf8)
+            return response
+        except ssl.SSLError as e:
+            if e.message == 'The read operation timed out':
+                raise NoResponseException()
+            else:
+                logger.debug('Catched exception:')
+                traceback.print_exc()
+                return {}
+
+
+class CastSocket(BaseChromecastSocket):
+    def __init__(self, ip):
+        BaseChromecastSocket.__init__(self, ip)
+        self.read_listeners = []
+        self.send_listeners = []
+        self.response_cache = {}
+
+    def send(self, command):
+        for listener in self.send_listeners:
+            command = listener(command)
+        logger.debug('Sending message:\n{command}'.format(
+            command=command))
+        BaseChromecastSocket.send(
+            self,
+            data=command.data,
+            sender_id=command.sender_id,
+            destination_id=command.destination_id,
+            namespace=command.namespace)
+        return command.request_id
+
+    def read(self, timeout=None):
+        if timeout is not None:
+            self.wait_for_read(timeout)
+        response = BaseChromecastSocket.read(self)
+        logger.debug('Recieved message:\n {message}'.format(
+            message=json.dumps(response, indent=2)))
+        for listener in self.read_listeners:
+            listener(response)
+        return response
+
+    def add_read_listener(self, listener):
+        self.read_listeners.append(listener)
+
+    def add_send_listener(self, listener):
+        self.send_listeners.append(listener)
+
+    def send_and_wait(self, command):
+        req_id = self.send(command)
+        return self.wait_for_response_id(req_id)
+
+    def wait_for_read(self, timeout=None):
+        start_time = time.time()
+        while True:
+            if self._is_socket_readable():
+                return
+            current_time = time.time()
+            if current_time - start_time > timeout:
+                raise NoResponseException()
+            time.sleep(0.1)
+
+    def wait_for_response_id(self, req_id, timeout=10):
+        start_time = time.time()
+        while True:
+            if not self._is_socket_readable():
+                time.sleep(0.1)
+            else:
+                response = self.read()
+                self._add_to_response_cache(response)
+                if req_id in self.response_cache:
+                    return response
+            current_time = time.time()
+            if current_time - start_time > timeout:
+                raise NoResponseException()
+        return None
+
+    def wait_for_response_type(self, _type, timeout=10):
+        start_time = time.time()
+        while True:
+            if not self._is_socket_readable():
+                time.sleep(0.1)
+            else:
+                response = self.read()
+                self._add_to_response_cache(response)
+                if response.get('type', None) == _type:
+                    return response
+            current_time = time.time()
+            if current_time - start_time > timeout:
+                raise NoResponseException()
+        return None
+
+    def wait(self, timeout=10):
+        start_time = time.time()
+        while True:
+            if not self._is_socket_readable():
+                time.sleep(0.1)
+            else:
+                response = self.read()
+                self._add_to_response_cache(response)
+            current_time = time.time()
+            if current_time - start_time > timeout:
+                return
+        return None
+
+    def _add_to_response_cache(self, response):
+        if 'requestId' in response:
+            req_id = response['requestId']
+            if int(req_id) != 0:
+                self.response_cache[req_id] = response
+
+    def _is_socket_readable(self):
+        try:
+            r, w, e = select.select([self.sock], [], [], 0)
+            for sock in r:
+                return True
+        except socket.error:
+            pass
+        return False

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/chromecast/pycastv2/commands.py Added

@@ -0,0 +1,164 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+
+class BaseCommand(object):
+    def __init__(self):
+        self._sender_id = None
+        self._destination_id = None
+        self._namespace = None
+        self._data = None
+
+    @property
+    def sender_id(self):
+        return self._sender_id
+
+    @sender_id.setter
+    def sender_id(self, value):
+        self._sender_id = value
+
+    @property
+    def destination_id(self):
+        return self._destination_id
+
+    @destination_id.setter
+    def destination_id(self, value):
+        self._destination_id = value
+
+    @property
+    def request_id(self):
+        if 'requestId' in self.data:
+            return self.data['requestId']
+        return 0
+
+    @request_id.setter
+    def request_id(self, value):
+        if value is not None:
+            self.data['requestId'] = value
+
+    @property
+    def session_id(self):
+        if 'sessionId' in self.data:
+            return self.data['sessionId']
+        return None
+
+    @session_id.setter
+    def session_id(self, value):
+        if value is not None:
+            self.data['sessionId'] = value
+
+    @property
+    def namespace(self):
+        return self._namespace
+
+    @namespace.setter
+    def namespace(self, value):
+        self._namespace = value
+
+    @property
+    def data(self):
+        return self._data
+
+    @data.setter
+    def data(self, value):
+        self._data = value
+
+    def __str__(self):
+        return ('<{class_name}>\n'
+                '  namespace: {namespace}\n'
+                '  destination_id: {destination_id}\n'
+                '  data: {data}'.format(
+                    class_name=self.__class__.__name__,
+                    namespace=self.namespace,
+                    destination_id=self.destination_id,
+                    data=self.data))
+
+
+class ConnectCommand(BaseCommand):
+    def __init__(self, destination_id=None, namespace=None, agent=None):
+        BaseCommand.__init__(self)
+        self.data = {
+            'origin': {},
+            'type': 'CONNECT',
+            'userAgent': agent or 'Unknown'
+        }
+        self.destination_id = destination_id
+        self.namespace = (namespace or
+                          'urn:x-cast:com.google.cast.tp.connection')
+
+
+class CloseCommand(BaseCommand):
+    def __init__(self, destination_id=None, namespace=None):
+        BaseCommand.__init__(self)
+        self.data = {
+            'origin': {},
+            'type': 'CLOSE'
+        }
+        self.destination_id = destination_id
+        self.namespace = (namespace or
+                          'urn:x-cast:com.google.cast.tp.connection')
+
+
+class StatusCommand(BaseCommand):
+    def __init__(self, destination_id=None, namespace=None):
+        BaseCommand.__init__(self)
+        self.data = {
+            'type': 'GET_STATUS'
+        }
+        self.request_id = False
+        self.destination_id = destination_id
+        self.namespace = namespace or 'urn:x-cast:com.google.cast.receiver'
+
+
+class LaunchCommand(BaseCommand):
+    def __init__(self, app_id, destination_id=None, namespace=None):
+        BaseCommand.__init__(self)
+        self.data = {
+            'appId': app_id,
+            'type': 'LAUNCH'
+        }
+        self.request_id = False
+        self.destination_id = destination_id
+        self.namespace = namespace or 'urn:x-cast:com.google.cast.receiver'
+
+
+class StopCommand(BaseCommand):
+    def __init__(self, session_id=False, destination_id=None,
+                 namespace=None):
+        BaseCommand.__init__(self)
+        self.data = {
+            'type': 'STOP'
+        }
+        self.session_id = False
+        self.request_id = False
+        self.destination_id = destination_id
+        self.namespace = namespace or 'urn:x-cast:com.google.cast.receiver'
+
+
+class PongCommand(BaseCommand):
+    def __init__(self, session_id=False, destination_id=None,
+                 namespace=None):
+        BaseCommand.__init__(self)
+        self.data = {
+            'type': 'PONG'
+        }
+        self.session_id = False
+        self.request_id = False
+        self.destination_id = destination_id
+        self.namespace = namespace or 'urn:x-cast:com.google.cast.tp.heartbeat'

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/chromecast/pycastv2/example.py Added

@@ -0,0 +1,32 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import logging
+import __init__ as pycastv2
+
+logging.basicConfig(level=logging.DEBUG)
+
+mc = pycastv2.MediaPlayerController('192.168.1.3')
+try:
+    mc.load('http://192.168.1.2:8080/stream.mp3', 'audio/mpeg')
+    mc.wait(10)
+    mc.disconnect_application()
+    # mc.stop_application()
+finally:
+    mc.cleanup()

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/chromecast/renderer.py Added

@@ -0,0 +1,135 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import requests
+import logging
+import urlparse
+import socket
+import traceback
+import BeautifulSoup
+
+import pycastv2
+import pulseaudio_dlna.plugins.renderer
+
+logger = logging.getLogger('pulseaudio_dlna.plugins.chromecast.renderer')
+
+
+class ChromecastRenderer(pulseaudio_dlna.plugins.renderer.BaseRenderer):
+
+    def __init__(self, name, ip):
+        pulseaudio_dlna.plugins.renderer.BaseRenderer.__init__(self)
+        self.flavour = 'Chromecast'
+        self.name = name
+        self.ip = ip
+        self.port = 8009
+        self.state = self.IDLE
+        self.protocols = [
+            'audio/mp3',
+            'audio/mp4',
+            'audio/ogg',
+            'audio/wav',
+        ]
+
+    def _get_media_player(self):
+        try:
+            return pycastv2.MediaPlayerController(self.ip)
+        except socket.error as e:
+            if e.errno == 111:
+                logger.info(
+                    'The chromecast refused the connection. Perhaps it '
+                    'does not support the castv2 protocol.')
+            else:
+                traceback.print_exc()
+            return None
+
+    def play(self, url):
+        cast = self._get_media_player()
+        if cast is None:
+            return 500
+        try:
+            if cast.load(url, self.encoder.mime_type) is True:
+                self.state = self.PLAYING
+                return 200
+            return 500
+        finally:
+            cast.cleanup()
+
+    def stop(self):
+        cast = self._get_media_player()
+        if cast is None:
+            return 500
+        try:
+            self.state = self.IDLE
+            if cast.disconnect_application() is True:
+                return 200
+            return 500
+        finally:
+            cast.cleanup()
+
+    def pause(self):
+        raise NotImplementedError()
+
+
+class CoinedChromecastRenderer(
+        pulseaudio_dlna.plugins.renderer.CoinedBaseRendererMixin, ChromecastRenderer):
+
+    def play(self):
+        try:
+            return ChromecastRenderer.play(self, self.get_stream_url())
+        except pulseaudio_dlna.plugins.renderer.NoSuitableEncoderFoundException:
+            return 500
+
+
+class ChromecastRendererFactory(object):
+
+    @classmethod
+    def from_url(self, url, type_=ChromecastRenderer):
+        try:
+            response = requests.get(url)
+            logger.debug('Response from chromecast device ({url})\n'
+                         '{response}'.format(url=url, response=response.text))
+        except requests.exceptions.ConnectionError:
+            logger.info(
+                'Could no connect to {url}. '
+                'Connection refused.'.format(url=url))
+            return None
+        soup = BeautifulSoup.BeautifulSoup(response.content)
+        url_object = urlparse.urlparse(url)
+        ip, port = url_object.netloc.split(':')
+        try:
+            model_name = soup.root.device.modelname.text
+            if model_name.strip() != 'Eureka Dongle':
+                logger.info(
+                    'The Chromecast seems not to be an original Chromecast! '
+                    'Model name: "{model_name}" Skipping device ...'.format(
+                        model_name=model_name))
+                return None
+            cast_device = type_(
+                soup.root.device.friendlyname.text,
+                ip)
+            return cast_device
+        except AttributeError:
+            logger.error(
+                'No valid XML returned from {url}.'.format(url=url))
+            return None
+
+    @classmethod
+    def from_header(self, header, type_=ChromecastRenderer):
+        if header.get('location', None):
+            return self.from_url(header['location'], type_)

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/renderer.py Added

@@ -0,0 +1,195 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import re
+import random
+import urlparse
+import functools
+import logging
+
+import pulseaudio_dlna.common
+import pulseaudio_dlna.pulseaudio
+
+logger = logging.getLogger('pulseaudio_dlna.plugins.renderer')
+
+
+class NoSuitableEncoderFoundException():
+    pass
+
+
+@functools.total_ordering
+class BaseRenderer(object):
+
+    IDLE = 'idle'
+    PLAYING = 'playing'
+    PAUSE = 'paused'
+    STOP = 'stopped'
+
+    def __init__(self):
+        self._name = None
+        self._short_name = None
+        self._label = None
+        self._ip = None
+        self._port = None
+        self._state = None
+        self._encoder = None
+        self._flavour = None
+        self._protocols = []
+
+    @property
+    def name(self):
+        return self._name
+
+    @name.setter
+    def name(self, name):
+        name = name.strip()
+        if name == '':
+            name = 'Unnamed device #{random_id}'.format(
+                random_id=random.randint(1000, 9999))
+        self._short_name = '{filtered_name}_{flavour}'.format(
+            filtered_name=re.sub(r'[^a-z0-9]', '', name.lower()),
+            flavour=self.flavour.lower())
+        self._name = name
+
+    @property
+    def short_name(self):
+        return self._short_name
+
+    @property
+    def label(self):
+        return '{name} ({flavour})'.format(
+            name=self.name, flavour=self.flavour)
+
+    @property
+    def ip(self):
+        return self._ip
+
+    @ip.setter
+    def ip(self, value):
+        self._ip = value
+
+    @property
+    def port(self):
+        return self._port
+
+    @port.setter
+    def port(self, value):
+        self._port = value
+
+    @property
+    def state(self):
+        return self._state
+
+    @state.setter
+    def state(self, value):
+        self._state = value
+
+    @property
+    def encoder(self):
+        if self._encoder is None:
+            for encoder in pulseaudio_dlna.common.supported_encoders:
+                if encoder.state is False:
+                    continue
+                for mime_type in encoder.mime_types:
+                    if mime_type in self.protocols:
+                        return encoder
+            logger.info('There was no suitable encoder found for "{name}". '
+                        'The device can play "{protocols}"'.format(
+                            name=self.label,
+                            protocols=','.join(self.protocols)))
+            raise NoSuitableEncoderFoundException()
+        else:
+            return self._encoder
+
+    @encoder.setter
+    def encoder(self, value):
+        self._encoder = value
+
+    @property
+    def flavour(self):
+        return self._flavour
+
+    @flavour.setter
+    def flavour(self, value):
+        self._flavour = value
+
+    @property
+    def protocols(self):
+        return self._protocols
+
+    @protocols.setter
+    def protocols(self, value):
+        self._protocols = value
+
+    def activate(self):
+        pass
+
+    def play(self):
+        raise NotImplementedError()
+
+    def pause(self):
+        raise NotImplementedError()
+
+    def stop(self):
+        raise NotImplementedError()
+
+    def __eq__(self, other):
+        if isinstance(other, BaseRenderer):
+            return self.short_name == other.short_name
+        if isinstance(other, pulseaudio_dlna.pulseaudio.PulseBridge):
+            return self.short_name == other.device.short_name
+
+    def __gt__(self, other):
+        if isinstance(other, BaseRenderer):
+            return self.short_name > other.short_name
+        if isinstance(other, pulseaudio_dlna.pulseaudio.PulseBridge):
+            return self.short_name > other.device.short_name
+
+    def __str__(self):
+        return '<{} name="{}" short="{}" state="{}" protocols="{}">'.format(
+            self.__class__.__name__,
+            self.name,
+            self.short_name,
+            self.state,
+            ','.join(self.protocols),
+        )
+
+
+class CoinedBaseRendererMixin():
+
+    server_ip = None
+    server_port = None
+
+    def set_server_location(self, ip, port):
+        self.server_ip = ip
+        self.server_port = port
+
+    def get_stream_url(self):
+        server_url = 'http://{ip}:{port}'.format(
+            ip=self.server_ip,
+            port=self.server_port,
+        )
+        stream_name = '/{stream_name}.{suffix}'.format(
+            stream_name=self.short_name,
+            suffix=self.encoder.suffix,
+        )
+        return urlparse.urljoin(server_url, stream_name)
+
+    def play(self):
+        raise NotImplementedError()

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/upnp Added

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/upnp/__init__.py Added

@@ -0,0 +1,41 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import pulseaudio_dlna.plugins
+import pulseaudio_dlna.plugins.upnp.renderer
+
+
+class DLNAPlugin(pulseaudio_dlna.plugins.BasePlugin):
+    def __init__(self, *args):
+        pulseaudio_dlna.plugins.BasePlugin.__init__(self, *args)
+        self.st_header = 'urn:schemas-upnp-org:device:MediaRenderer:1'
+
+    def lookup(self, locations):
+        renderers = []
+        for url in locations:
+            renderer = pulseaudio_dlna.plugins.upnp.renderer.UpnpMediaRendererFactory.from_url(
+                url, pulseaudio_dlna.plugins.upnp.renderer.CoinedUpnpMediaRenderer)
+            if renderer is not None:
+                renderers.append(renderer)
+        return renderers
+
+    def create_device(self, header):
+        return pulseaudio_dlna.plugins.upnp.renderer.UpnpMediaRendererFactory.from_header(
+            header,
+            pulseaudio_dlna.plugins.upnp.renderer.CoinedUpnpMediaRenderer)

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/upnp/renderer.py Added

@@ -0,0 +1,384 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import cgi
+import requests
+import urlparse
+import socket
+import logging
+import pkg_resources
+import BeautifulSoup
+import pulseaudio_dlna.pulseaudio
+import pulseaudio_dlna.encoders
+import pulseaudio_dlna.common
+import pulseaudio_dlna.plugins.renderer
+
+logger = logging.getLogger('pulseaudio_dlna.plugins.upnp.renderer')
+
+
+class UpnpContentFlags(object):
+
+    SENDER_PACED = 80000000
+    LSOP_TIME_BASED_SEEK_SUPPORTED = 40000000
+    LSOP_BYTE_BASED_SEEK_SUPPORTED = 20000000
+    PLAY_CONTAINER_SUPPORTED = 10000000
+    S0_INCREASING_SUPPORTED = 8000000
+    SN_INCREASING_SUPPORTED = 4000000
+    RTSP_PAUSE_SUPPORTED = 2000000
+    STREAMING_TRANSFER_MODE_SUPPORTED = 1000000
+    INTERACTIVE_TRANSFER_MODE_SUPPORTED = 800000
+    BACKGROUND_TRANSFER_MODE_SUPPORTED = 400000
+    CONNECTION_STALLING_SUPPORTED = 200000
+    DLNA_VERSION_15_SUPPORTED = 100000
+
+    def __init__(self, flags=None):
+        self.flags = flags or []
+
+    def __str__(self):
+        return str(sum(self.flags)).zfill(8)
+
+
+class UpnpContentFeatures(object):
+
+    def __init__(self, support_time_seek=False, support_range=False,
+                 transcoded=False, flags=None):
+        self.support_time_seek = False
+        self.support_range = False
+        self.is_transcoded = False
+        self.flags = UpnpContentFlags(flags or [])
+
+    def __str__(self):
+        return 'DLNA.ORG_OP={}{};DLNA.ORG_CI={};DLNA.ORG_FLAGS={}'.format(
+            ('1' if self.support_time_seek else '0'),
+            ('1' if self.support_range else '0'),
+            ('1' if self.is_transcoded else '0'),
+            (str(self.flags) + ('0' * 24)))
+
+
+class UpnpService(object):
+
+    SERVICE_TRANSPORT = 'transport'
+    SERVICE_CONNECTION = 'connection'
+    SERVICE_RENDERING = 'rendering'
+
+    def __init__(self, ip, port, service):
+
+        self.ip = ip
+        self.port = port
+
+        if service['service_type'].startswith(
+                'urn:schemas-upnp-org:service:AVTransport:'):
+            self._type = self.SERVICE_TRANSPORT
+        elif service['service_type'].startswith(
+                'urn:schemas-upnp-org:service:ConnectionManager:'):
+            self._type = self.SERVICE_CONNECTION
+        elif service['service_type'].startswith(
+                'urn:schemas-upnp-org:service:RenderingControl:'):
+            self._type = self.SERVICE_RENDERING
+        else:
+            self._type = None
+
+        self._service_type = service['service_type']
+        self._control_url = service['control_url']
+        self._event_url = service['eventsub_url']
+
+    @property
+    def type(self):
+        return self._type
+
+    @property
+    def service_type(self):
+        return self._service_type
+
+    @property
+    def control_url(self):
+        host = 'http://{ip}:{port}'.format(
+            ip=self.ip,
+            port=self.port,
+        )
+        return urlparse.urljoin(host, self._control_url)
+
+    @property
+    def event_url(self):
+        host = 'http://{ip}:{port}'.format(
+            ip=self.ip,
+            port=self.port,
+        )
+        return urlparse.urljoin(host, self._event_url)
+
+
+class UpnpMediaRenderer(pulseaudio_dlna.plugins.renderer.BaseRenderer):
+
+    ENCODING = 'utf-8'
+
+    def __init__(self, name, ip, port, udn, services, encoder=None):
+        pulseaudio_dlna.plugins.renderer.BaseRenderer.__init__(self)
+        self.flavour = 'DLNA'
+        self.name = name
+        self.ip = ip
+        self.port = port
+        self.state = self.IDLE
+        self.encoder = encoder
+        self.protocols = []
+
+        self.udn = udn
+        self.xml = self._load_xml_files()
+        self.service_transport = None
+        self.service_connection = None
+        self.service_rendering = None
+
+        for service in services:
+            service = UpnpService(ip, port, service)
+            if service.type == UpnpService.SERVICE_TRANSPORT:
+                self.service_transport = service
+            if service.type == UpnpService.SERVICE_CONNECTION:
+                self.service_connection = service
+            if service.type == UpnpService.SERVICE_RENDERING:
+                self.service_rendering = service
+
+    def activate(self):
+        self.get_protocol_info()
+
+    def _load_xml_files(self):
+        content = {}
+        self.xml_files = {
+            'register': 'xml/register.xml',
+            'register_metadata': 'xml/register_metadata.xml',
+            'play': 'xml/play.xml',
+            'stop': 'xml/stop.xml',
+            'pause': 'xml/pause.xml',
+            'get_protocol_info': 'xml/get_protocol_info.xml',
+        }
+        for ident, path in self.xml_files.items():
+            file_name = pkg_resources.resource_filename(
+                'pulseaudio_dlna.plugins.upnp', path)
+            with open(file_name, 'r') as f:
+                content[ident] = unicode(f.read())
+        return content
+
+    def _debug(self, action, url, headers, data, response):
+        logger.debug(
+            'sending {action} to {url}:\n'
+            ' - headers:\n{headers}\n'
+            ' - data:\n{data}'
+            ' - result: {status_code}\n{result}'.format(
+                action=action.upper(),
+                url=url,
+                headers=headers,
+                data=data,
+                status_code=response.status_code,
+                result=response.text))
+
+    def register(self, stream_url):
+        url = self.service_transport.control_url
+        headers = {
+            'Content-Type':
+                'text/xml; charset="{encoding}"'.format(
+                    encoding=self.ENCODING),
+            'SOAPAction':
+                '"{service_type}#SetAVTransportURI"'.format(
+                    service_type=self.service_transport.service_type),
+        }
+        content_features = UpnpContentFeatures(
+            flags=[
+                UpnpContentFlags.STREAMING_TRANSFER_MODE_SUPPORTED,
+                UpnpContentFlags.BACKGROUND_TRANSFER_MODE_SUPPORTED,
+                UpnpContentFlags.CONNECTION_STALLING_SUPPORTED,
+                UpnpContentFlags.DLNA_VERSION_15_SUPPORTED
+            ])
+        metadata = self.xml['register_metadata'].format(
+            stream_url=stream_url,
+            title='Live Audio',
+            artist='PulseAudio on {}'.format(socket.gethostname()),
+            creator='PulseAudio',
+            album='Stream',
+            encoding=self.ENCODING,
+            mime_type=self.encoder.mime_type,
+            content_features=str(content_features),
+        )
+        data = self.xml['register'].format(
+            stream_url=stream_url,
+            current_url_metadata=cgi.escape(metadata),
+            encoding=self.ENCODING,
+            service_type=self.service_transport.service_type,
+        )
+        response = requests.post(
+            url, data=data.encode(self.ENCODING), headers=headers)
+        self._debug('register', url, headers, data, response)
+        return response.status_code
+
+    def get_protocol_info(self):
+        url = self.service_connection.control_url
+        headers = {
+            'Content-Type':
+                'text/xml; charset="{encoding}"'.format(
+                    encoding=self.ENCODING),
+            'SOAPAction': '"{service_type}#GetProtocolInfo"'.format(
+                service_type=self.service_connection.service_type),
+        }
+        data = self.xml['get_protocol_info'].format(
+            encoding=self.ENCODING,
+            service_type=self.service_connection.service_type,
+        )
+        response = requests.post(
+            url, data=data.encode(self.ENCODING), headers=headers)
+        if response.status_code == 200:
+            soup = BeautifulSoup.BeautifulSoup(response.content)
+            try:
+                self.protocols = []
+                sinks = soup('sink')[0].text
+                for sink in sinks.split(','):
+                    http_get, w1, mime_type, w2 = sink.strip().split(':')
+                    if mime_type.startswith('audio/'):
+                        self.protocols.append(mime_type)
+            except IndexError:
+                logger.error(
+                    'IndexError: No valid XML returned from {url}.'.format(
+                        url=url))
+
+        self._debug('get_protocol_info', url, headers, data, response)
+        return response.status_code
+
+    def play(self):
+        url = self.service_transport.control_url
+        headers = {
+            'Content-Type':
+                'text/xml; charset="{encoding}"'.format(
+                    encoding=self.ENCODING),
+            'SOAPAction': '"{service_type}#Play"'.format(
+                service_type=self.service_transport.service_type),
+        }
+        data = self.xml['play'].format(
+            encoding=self.ENCODING,
+            service_type=self.service_transport.service_type,
+        )
+        response = requests.post(
+            url, data=data.encode(self.ENCODING), headers=headers)
+        if response.status_code == 200:
+            self.state = self.PLAYING
+        self._debug('play', url, headers, data, response)
+        return response.status_code
+
+    def stop(self):
+        url = self.service_transport.control_url
+        headers = {
+            'Content-Type':
+                'text/xml; charset="{encoding}"'.format(
+                    encoding=self.ENCODING),
+            'SOAPAction': '"{service_type}#Stop"'.format(
+                service_type=self.service_transport.service_type),
+        }
+        data = self.xml['stop'].format(
+            encoding=self.ENCODING,
+            service_type=self.service_transport.service_type,
+        )
+        response = requests.post(
+            url, data=data.encode(self.ENCODING), headers=headers)
+        if response.status_code == 200:
+            self.state = self.IDLE
+        self._debug('stop', url, headers, data, response)
+        return response.status_code
+
+    def pause(self):
+        url = self.service_transport.control_url
+        headers = {
+            'Content-Type':
+                'text/xml; charset="{encoding}"'.format(
+                    encoding=self.ENCODING),
+            'SOAPAction': '"{service_type}#Pause"'.format(
+                service_type=self.service_transport.service_type),
+        }
+        data = self.xml['pause'].format(
+            encoding=self.ENCODING,
+            service_type=self.service_transport.service_type,
+        )
+        response = requests.post(
+            url, data=data.encode(self.ENCODING), headers=headers)
+        if response.status_code == 200:
+            self.state = self.PAUSE
+        self._debug('pause', url, headers, data, response)
+        return response.status_code
+
+
+class CoinedUpnpMediaRenderer(
+        pulseaudio_dlna.plugins.renderer.CoinedBaseRendererMixin, UpnpMediaRenderer):
+
+    def play(self):
+        try:
+            stream_url = self.get_stream_url()
+            if UpnpMediaRenderer.register(self, stream_url) == 200:
+                return UpnpMediaRenderer.play(self)
+            else:
+                logger.error('"{}" registering failed!'.format(self.name))
+        except requests.exceptions.ConnectionError:
+            logger.error('The device refused the connection!')
+            return 404
+        except pulseaudio_dlna.plugins.renderer.NoSuitableEncoderFoundException:
+            logger.error('Could not find a suitable encoder!')
+            return 500
+
+
+class UpnpMediaRendererFactory(object):
+
+    ST_HEADER = 'urn:schemas-upnp-org:device:MediaRenderer:1'
+
+    @classmethod
+    def from_url(self, url, type_=UpnpMediaRenderer):
+        try:
+            response = requests.get(url)
+            logger.debug('Response from UPNP device ({url})\n'
+                         '{response}'.format(url=url, response=response.text))
+        except requests.exceptions.ConnectionError:
+            logger.info(
+                'Could no connect to {url}. '
+                'Connection refused.'.format(url=url))
+            return None
+        soup = BeautifulSoup.BeautifulSoup(response.content)
+        url_object = urlparse.urlparse(url)
+        ip, port = url_object.netloc.split(':')
+        services = []
+        try:
+            for device in soup.root.findAll('device'):
+                if device.devicetype.text != self.ST_HEADER:
+                    continue
+                for service in device.findAll('service'):
+                    service = {
+                        'service_type': service.servicetype.text,
+                        'service_id': service.serviceid.text,
+                        'scpd_url': service.scpdurl.text,
+                        'control_url': service.controlurl.text,
+                        'eventsub_url': service.eventsuburl.text,
+                    }
+                    services.append(service)
+                upnp_device = type_(
+                    soup.root.device.friendlyname.text,
+                    ip,
+                    port,
+                    soup.root.device.udn.text,
+                    services)
+                return upnp_device
+        except AttributeError:
+            logger.error(
+                'No valid XML returned from {url}.'.format(url=url))
+            return None
+
+    @classmethod
+    def from_header(self, header, type_=UpnpMediaRenderer):
+        if header.get('location', None):
+            return self.from_url(header['location'], type_)

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/upnp/xml Added

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/upnp/xml/get_protocol_info.xml Added

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/upnp/xml/pause.xml Added

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/upnp/xml/play.xml Added

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/upnp/xml/register.xml Added

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/upnp/xml/register_metadata.xml Added

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/plugins/upnp/xml/stop.xml Added

pulseaudio-dlna-0.3.5.tar.gz/pulseaudio_dlna/pulseaudio.py -> pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/pulseaudio.py Changed

@@ -18,12 +18,22 @@
 from __future__ import unicode_literals
 
 import sys
+import locale
 import dbus
 import os
+import struct
 import subprocess
 import logging
+import setproctitle
+import gobject
 import functools
-import upnp.renderer
+import copy
+import signal
+
+import pulseaudio_dlna.plugins.renderer
+import pulseaudio_dlna.notification
+
+logger = logging.getLogger('pulseaudio_dlna.pulseaudio')
 
 
 class PulseAudio(object):
@@ -31,6 +41,9 @@
         self.streams = []
         self.sinks = []
 
+        self.fallback_sink = None
+        self.system_sinks = []
+
     def _connect(self, signals):
         self.bus = self._get_bus()
         self.core = self.bus.get_object(object_path='/org/pulseaudio/core1')
@@ -39,6 +52,24 @@
             self.core.ListenForSignal(
                 interface.format(sig_name), dbus.Array(signature='o'))
 
+        try:
+            fallback_sink_path = self.core.Get(
+                'org.PulseAudio.Core1', 'FallbackSink',
+                dbus_interface='org.freedesktop.DBus.Properties')
+            self.fallback_sink = PulseSinkFactory.new(
+                self.bus, fallback_sink_path)
+        except:
+            logger.info(
+                'Could not get default sink. Perhaps there is no one set?')
+
+        system_sink_paths = self.core.Get(
+            'org.PulseAudio.Core1', 'Sinks',
+            dbus_interface='org.freedesktop.DBus.Properties')
+        for sink_path in system_sink_paths:
+            sink = PulseSinkFactory.new(self.bus, sink_path)
+            if sink:
+                self.system_sinks.append(sink)
+
     def _get_bus_address(self):
         server_address = os.environ.get('PULSE_DBUS_SERVER', None)
         if server_address is None and \
@@ -65,8 +96,8 @@
                 server_address = self._get_bus_address()
                 return dbus.connection.Connection(server_address)
             except dbus.exceptions.DBusException:
-                logging.error('PulseAudio seems not to be running or pulseaudio '
-                              'dbus module could not be loaded.')
+                logger.error('PulseAudio seems not to be running or PulseAudio'
+                             ' dbus module could not be loaded.')
                 sys.exit(1)
 
     def update(self):
@@ -85,13 +116,9 @@
 
         self.streams = []
         for stream_path in stream_paths:
-            obj = self.bus.get_object(object_path=stream_path)
-            stream = PulseStream(
-                object_path=str(stream_path),
-                index=str(obj.Get('org.PulseAudio.Core1.Stream', 'Index')),
-                device=str(obj.Get('org.PulseAudio.Core1.Stream', 'Device')),
-            )
-            self.streams.append(stream)
+            stream = PulseStreamFactory.new(self.bus, stream_path)
+            if stream:
+                self.streams.append(stream)
 
     def update_sinks(self):
         sink_paths = self.core.Get(
@@ -100,13 +127,10 @@
 
         self.sinks = []
         for sink_path in sink_paths:
-            obj = self.bus.get_object(object_path=sink_path)
-            sink = PulseSink(
-                object_path=str(sink_path),
-                index=str(obj.Get('org.PulseAudio.Core1.Device', 'Index')),
-                name=str(obj.Get('org.PulseAudio.Core1.Device', 'Name')),
-            )
-            self.sinks.append(sink)
+            sink = PulseSinkFactory.new(self.bus, sink_path)
+            if sink:
+                sink.fallback_sink = self.fallback_sink
+                self.sinks.append(sink)
 
     def create_null_sink(self, sink_name, sink_description):
         cmd = [
@@ -118,12 +142,11 @@
                 sink_description.replace(' ', '\ ')
             ),
         ]
-        entity_id = int(subprocess.check_output(cmd))
-        if entity_id > 0:
+        module_id = int(subprocess.check_output(cmd))
+        if module_id > 0:
             self.update_sinks()
             for sink in self.sinks:
-                if sink.name == sink_name:
-                    sink.entity = entity_id  # ugly hack
+                if int(sink.module.index) == module_id:
                     return sink
 
     def delete_null_sink(self, id):
@@ -132,11 +155,31 @@
             'unload-module',
             str(id),
         ]
-        subprocess.check_output(cmd)
+        try:
+            subprocess.check_output(cmd)
+        except:
+            logger.error('Could not remove entity {id}'.format(id=id))
+
+
+class PulseModuleFactory(object):
+
+    @classmethod
+    def new(self, bus, module_path):
+        try:
+            obj = bus.get_object(object_path=module_path)
+            return PulseModule(
+                object_path=unicode(module_path),
+                index=unicode(obj.Get('org.PulseAudio.Core1.Module', 'Index')),
+                name=unicode(obj.Get('org.PulseAudio.Core1.Module', 'Name')),
+            )
+        except dbus.exceptions.DBusException:
+            logger.error('Could not get "{object_path}" from dbus.'.format(
+                object_path=module_path))
+            return None
 
 
 @functools.total_ordering
-class PulseSink(object):
+class PulseModule(object):
 
     __shared_state = {}
 
@@ -149,12 +192,88 @@
         self.index = index
         self.name = name
 
-        if hasattr(self, 'entity') is False:
-            self.entity = None
+    def __eq__(self, other):
+        return self.object_path == other.object_path
+
+    def __gt__(self, other):
+        return self.object_path > other.object_path
+
+    def __str__(self):
+        return '<PulseModule path="{}" name="{}" index="{}">\n'.format(
+            self.object_path,
+            self.name,
+            self.index,
+        )
+
+
+class PulseSinkFactory(object):
+
+    @classmethod
+    def new(self, bus, object_path):
+        try:
+            obj = bus.get_object(object_path=object_path)
+
+            properties = obj.Get('org.PulseAudio.Core1.Device', 'PropertyList')
+            description_bytes = properties.get('device.description', [])
+            label = self._convert_bytes_to_unicode(description_bytes)
+            module_path = unicode(
+                obj.Get('org.PulseAudio.Core1.Device', 'OwnerModule'))
+
+            return PulseSink(
+                object_path=unicode(object_path),
+                index=unicode(obj.Get('org.PulseAudio.Core1.Device', 'Index')),
+                name=unicode(obj.Get('org.PulseAudio.Core1.Device', 'Name')),
+                label=label,
+                module=PulseModuleFactory.new(bus, module_path),
+            )
+        except dbus.exceptions.DBusException:
+            logger.error('Could not get "{object_path}" from dbus.'.format(
+                object_path=object_path))
+            return None
+
+    @classmethod
+    def _convert_bytes_to_unicode(self, byte_array):
+        name = bytes()
+        for i, b in enumerate(byte_array):
+            if not (i == len(byte_array) - 1 and int(b) == 0):
+                name += struct.pack('<B', b)
+        return name.decode(locale.getpreferredencoding())
+
+
+@functools.total_ordering
+class PulseSink(object):
+
+    __shared_state = {}
+
+    def __init__(self, object_path, index, name, label, module,
+                 fallback_sink=None):
+        if object_path not in self.__shared_state:
+            self.__shared_state[object_path] = {}
+        self.__dict__ = self.__shared_state[object_path]
+
+        self.object_path = object_path
+        self.index = index
+        self.name = name
+        self.label = label or name
+        self.module = module
+        self.fallback_sink = fallback_sink
 
         self.monitor = self.name + '.monitor'
         self.streams = []
 
+    def set_as_default_sink(self):
+        cmd = [
+            'pactl',
+            'set-default-sink',
+            str(self.index),
+        ]
+        subprocess.check_output(cmd)
+
+    def switch_streams_to_fallback_source(self):
+        if self.fallback_sink is not None:
+            for stream in self.streams:
+                stream.switch_to_source(self.fallback_sink.index)
+
     def __eq__(self, other):
         return self.object_path == other.object_path
 
@@ -162,10 +281,13 @@
         return self.object_path > other.object_path
 
     def __str__(self):
-        string = '<PulseSink path="{}" name="{}" entity="{}">\n'.format(
+        string = ('<PulseSink path="{}" label="{}" name="{}" index="{}" '
+                  'module="{}">\n').format(
             self.object_path,
+            self.label,
             self.name,
-            self.entity,
+            self.index,
+            self.module.index,
         )
         if len(self.streams) == 0:
             string = string + '        -- no streams --'
@@ -175,6 +297,23 @@
         return string
 
 
+class PulseStreamFactory(object):
+
+    @classmethod
+    def new(self, bus, stream_path):
+        try:
+            obj = bus.get_object(object_path=stream_path)
+            return PulseStream(
+                object_path=unicode(stream_path),
+                index=unicode(obj.Get('org.PulseAudio.Core1.Stream', 'Index')),
+                device=unicode(obj.Get('org.PulseAudio.Core1.Stream', 'Device')),
+            )
+        except dbus.exceptions.DBusException:
+            logger.error('Could not get "{object_path}" from dbus.'.format(
+                object_path=stream_path))
+            return None
+
+
 @functools.total_ordering
 class PulseStream(object):
 
@@ -189,6 +328,15 @@
         self.index = index
         self.device = device
 
+    def switch_to_source(self, index):
+        cmd = [
+            'pactl',
+            'move-sink-input',
+            str(self.index),
+            str(index),
+        ]
+        subprocess.check_output(cmd)
+
     def __eq__(self, other):
         return self.object_path == other.object_path
 
@@ -196,70 +344,172 @@
         return self.object_path > other.object_path
 
     def __str__(self):
-        return '<PulseStream path="{}" device="{}">'.format(
+        return '<PulseStream path="{}" device="{}" index="{}">'.format(
             self.object_path,
             self.device,
+            self.index,
         )
 
 
-class PulseUpnpBridge(object):
-    def __init__(self, sink, upnp_device):
+class PulseBridge(object):
+    def __init__(self, sink, device):
         self.sink = sink
-        self.upnp_device = upnp_device
+        self.device = device
 
     def __cmp__(self, other):
-        if isinstance(other, PulseUpnpBridge):
-            return (self.upnp_device == other.upnp_device and
+        if isinstance(other, PulseBridge):
+            return (self.device == other.device and
                     self.sink == other.sink)
-        if isinstance(other, upnp.renderer.UpnpMediaRenderer):
-            return self.upnp_device == other
+        if isinstance(other, pulseaudio_dlna.plugins.renderer.BaseRenderer):
+            return self.device == other
 
     def __str__(self):
-        return "<Bridge>\n    {}\n    {}\n".format(self.sink, self.upnp_device)
+        return "<Bridge>\n    {}\n    {}\n".format(self.sink, self.device)
 
 
 class PulseWatcher(PulseAudio):
-    def __init__(self):
+    def __init__(self, bridges_shared, message_queue):
         PulseAudio.__init__(self)
 
         self.bridges = []
-        self.upnp_devices = []
+        self.bridges_shared = bridges_shared
+        self.devices = []
+
+        self.message_queue = message_queue
+        self.blocked_devices = []
 
         signals = (
             ('NewPlaybackStream', 'org.PulseAudio.Core1.{}',
                 self.on_new_playback_stream),
             ('PlaybackStreamRemoved', 'org.PulseAudio.Core1.{}',
                 self.on_playback_stream_removed),
+            ('FallbackSinkUpdated', 'org.PulseAudio.Core1.{}',
+                self.on_fallback_sink_updated),
             ('DeviceUpdated', 'org.PulseAudio.Core1.Stream.{}',
                 self.on_device_updated),
         )
         self._connect(signals)
         self.update()
+        self.default_sink = self.fallback_sink
+
+    def terminate(self, signal_number=None, frame=None):
+        self.cleanup()
+        sys.exit(0)
+
+    def run(self):
+        signal.signal(signal.SIGINT, self.terminate)
+        signal.signal(signal.SIGTERM, self.terminate)
+        setproctitle.setproctitle('pulse_watcher')
+        mainloop = gobject.MainLoop()
+        gobject.timeout_add(500, self._check_message_queue)
+        try:
+            mainloop.run()
+        except KeyboardInterrupt:
+            pass
 
-    def set_upnp_devices(self, upnp_devices):
-        self.upnp_devices = upnp_devices
-        for upnp_device in upnp_devices:
-            self._ensure_bridge(upnp_device)
+    def _check_message_queue(self):
+        try:
+            message = self.message_queue.get_nowait()
+        except:
+            return True
+
+        message_type = message.get('type', None)
+        if message_type and hasattr(self, message_type):
+            del message['type']
+            getattr(self, message_type)(**message)
+        return True
+
+    def _block_device_handling(self, object_path):
+        self.blocked_devices.append(object_path)
+        gobject.timeout_add(1000, self._unblock_device_handling, object_path)
+
+    def _unblock_device_handling(self, object_path):
+        self.blocked_devices.remove(object_path)
+
+    def set_devices(self, devices):
+        self.devices = devices
+        self.update_bridges()
+        self.share_bridges()
+
+    def share_bridges(self):
+        del self.bridges_shared[:]
+        for bridge in copy.deepcopy(self.bridges):
+            self.bridges_shared.append(bridge)
+
+    def update_bridges(self):
+        for device in self.devices:
+            if device not in self.bridges:
+                sink = self.create_null_sink(
+                    device.short_name, device.label)
+                self.bridges.append(PulseBridge(sink, device))
 
-    def _ensure_bridge(self, upnp_device):
-        if upnp_device not in self.bridges:
-            sink = self.create_null_sink(
-                upnp_device.short_name, upnp_device.name)
-            self.bridges.append(PulseUpnpBridge(sink, upnp_device))
+    def update(self):
+        PulseAudio.update(self)
+        self.share_bridges()
 
     def cleanup(self):
         for bridge in self.bridges:
-            logging.info('remove "{}" sink ...'.format(bridge.sink))
-            self.delete_null_sink(bridge.sink.entity)
+            logger.info('Remove "{}" sink ...'.format(bridge.sink.name))
+            self.delete_null_sink(bridge.sink.module.index)
+
+    def _was_stream_moved(self, moved_stream, ignore_sink):
+        for sink in self.system_sinks:
+            if sink == ignore_sink:
+                continue
+            for stream in sink.streams:
+                if stream == moved_stream:
+                    return True
+        for bridge in self.bridges:
+            if bridge.sink == ignore_sink:
+                continue
+            for stream in bridge.sink.streams:
+                if stream == moved_stream:
+                    return True
+        return False
+
+    def switch_back(self, bridge, reason):
+        title = 'Device "{label}"'.format(label=bridge.device.label)
+        message = ('{reason}. Your streams were switched '
+                   'back to <b>{name}</b>'.format(
+                       reason=reason,
+                       name=(self.fallback_sink.label).encode(
+                           locale.getpreferredencoding())))
+        pulseaudio_dlna.notification.show(title, message)
+
+        self._block_device_handling(bridge.sink.object_path)
+        if bridge.sink == self.default_sink:
+            self.fallback_sink.set_as_default_sink()
+        bridge.sink.switch_streams_to_fallback_source()
+
+    def on_bridge_disconnected(self, stopped_bridge):
+
+        for sink in self.sinks:
+            if sink == stopped_bridge.sink:
+                stopped_bridge.sink = sink
+                break
+
+        reason = 'The device disconnected'
+        if len(stopped_bridge.sink.streams) > 1:
+            self.switch_back(stopped_bridge, reason)
+        elif len(stopped_bridge.sink.streams) == 1:
+            stream = stopped_bridge.sink.streams[0]
+            if not self._was_stream_moved(stream, stopped_bridge.sink):
+                self.switch_back(stopped_bridge, reason)
+        elif len(stopped_bridge.sink.streams) == 0:
+            pass
 
     def on_device_updated(self, sink_path):
-        logging.info('PulseWatcher.on_device_updated "{path}"'.format(
+        logger.info('on_device_updated "{path}"'.format(
             path=sink_path))
         self.update()
         self._handle_sink_update(sink_path)
 
+    def on_fallback_sink_updated(self, sink_path):
+        self.default_sink = PulseSinkFactory.new(self.bus, sink_path)
+        self.update()
+
     def on_new_playback_stream(self, stream_path):
-        logging.info('PulseWatcher.on_new_playback_stream "{path}"'.format(
+        logger.info('on_new_playback_stream "{path}"'.format(
             path=stream_path))
         self.update()
         for sink in self.sinks:
@@ -269,7 +519,7 @@
                     return
 
     def on_playback_stream_removed(self, stream_path):
-        logging.info('PulseWatcher.on_playback_stream_removed "{path}"'.format(
+        logger.info('on_playback_stream_removed "{path}"'.format(
             path=stream_path))
         for sink in self.sinks:
             for stream in sink.streams:
@@ -279,29 +529,53 @@
                     return
 
     def _handle_sink_update(self, sink_path):
+
+        if sink_path in self.blocked_devices:
+            logger.info('{sink_path} was blocked!'.format(sink_path=sink_path))
+            return
+
         for bridge in self.bridges:
-            if bridge.upnp_device.state == bridge.upnp_device.PLAYING:
+            if bridge.device.state == bridge.device.PLAYING:
                 if len(bridge.sink.streams) == 0:
-                    if bridge.upnp_device.stop() == 200:
-                        logging.info('"{}" was stopped.'.format(
-                            bridge.upnp_device.name))
+                    if bridge.device.stop() == 200:
+                        logger.info('The device "{}" was stopped.'.format(
+                            bridge.device.label))
                     else:
-                        logging.error('"{}" stopping failed!'.format(
-                            bridge.upnp_device.name))
+                        logger.error('The device "{}" failed to stop!'.format(
+                            bridge.device.label))
                     continue
             if bridge.sink.object_path == sink_path:
-                if bridge.upnp_device.state == bridge.upnp_device.IDLE:
-                    if bridge.upnp_device.register() == 200:
-                        logging.info('"{}" registered.'.format(
-                            bridge.upnp_device.name))
+                if bridge.device.state == bridge.device.IDLE or \
+                   bridge.device.state == bridge.device.PAUSE:
+                    if bridge.device.play() == 200:
+                        logger.info('The device "{}" is playing.'.format(
+                            bridge.device.label))
                     else:
-                        logging.error('"{}" registering failed!'.format(
-                            bridge.upnp_device.name))
-                if bridge.upnp_device.state == bridge.upnp_device.IDLE or \
-                   bridge.upnp_device.state == bridge.upnp_device.PAUSE:
-                    if bridge.upnp_device.play() == 200:
-                        logging.info('"{}" is playing.'.format(
-                            bridge.upnp_device.name))
-                    else:
-                        logging.error('"{}" playing failed!'.format(
-                            bridge.upnp_device.name))
+                        logger.error('The device "{}" failed to play!'.format(
+                            bridge.device.label))
+                        self.switch_back(
+                            bridge, 'The device failed to started.')
+
+    def add_device(self, device):
+        self.devices.append(device)
+        sink = self.create_null_sink(
+            device.short_name, device.label)
+        self.bridges.append(PulseBridge(sink, device))
+        self.update()
+        logger.info('Added the device "{name} ({flavour})".'.format(
+            name=device.name, flavour=device.flavour))
+
+    def remove_device(self, device):
+        self.devices.remove(device)
+        bridge_index_to_remove = None
+        for index, bridge in enumerate(self.bridges):
+            if bridge.device == device:
+                logger.info('Remove "{}" sink ...'.format(bridge.sink.name))
+                bridge_index_to_remove = index
+                self.delete_null_sink(bridge.sink.module.index)
+                break
+        if bridge_index_to_remove is not None:
+            self.bridges.pop(bridge_index_to_remove)
+            self.update()
+            logger.info('Removed the device "{name}".'.format(
+                name=device.name))

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/recorders.py Added

@@ -0,0 +1,38 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+
+class BaseRecorder(object):
+    def __init__(self):
+        self._command = ''
+
+    @property
+    def command(self):
+        return self._command
+
+
+class PulseaudioRecorder(BaseRecorder):
+    def __init__(self, sink_path):
+        BaseRecorder.__init__(self)
+        self._command = 'parec --format=s16le -d {sink_path}'
+        self._sink_path = sink_path
+
+    @property
+    def command(self):
+        return self._command.format(sink_path=self._sink_path)

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/renderers.py Added

@@ -0,0 +1,124 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import re
+import logging
+import threading
+
+logger = logging.getLogger('pulseaudio_dlna.renderers')
+
+
+class RendererHolder(object):
+
+    SSDP_ALIVE = 'ssdp:alive'
+    SSDP_BYEBYE = 'ssdp:byebye'
+
+    def __init__(
+            self, stream_server_address, message_queue, plugins,
+            device_filter=None):
+        self.renderers = {}
+        self.registered = {}
+        self.stream_server_address = stream_server_address
+        self.device_filter = device_filter
+        self.message_queue = message_queue
+        self.lock = threading.Lock()
+        for plugin in plugins:
+            self._register(plugin.st_header, plugin)
+
+    def add_renderers_by_url(self, locations):
+        for plugin in self.registered.values():
+            for device in plugin.lookup(locations):
+                self._add_renderer(device.udn, device)
+
+    def _register(self, identifier, _type):
+        self.registered[identifier] = _type
+
+    def _retrieve_header_map(self, header):
+        header = re.findall(r"(?P<name>.*?): (?P<value>.*?)\r\n", header)
+        header = {k.lower(): v for k, v in dict(header).items()}
+        return header
+
+    def _retrieve_device_id(self, header):
+        if 'usn' in header:
+            match = re.search(
+                "(uuid:[0-9a-f\-]+)::.*", header['usn'], re.IGNORECASE)
+            if match:
+                return match.group(1)
+        return None
+
+    def _add_renderer_with_filter_check(self, device_id, device):
+        if self.device_filter is None or device.name in self.device_filter:
+            self._add_renderer(device_id, device)
+        else:
+            logger.info('Skipped the device "{name}."'.format(
+                name=device.name))
+
+    def _add_renderer(self, device_id, device):
+        device.activate()
+        ip, port = self.stream_server_address
+        device.set_server_location(ip, port)
+        self.renderers[device_id] = device
+        self.message_queue.put({
+            'type': 'add_device',
+            'device': device
+        })
+
+    def _remove_renderer_by_id(self, device_id):
+        device = self.renderers[device_id]
+        self.message_queue.put({
+            'type': 'remove_device',
+            'device': device
+        })
+        del self.renderers[device_id]
+
+    def add_from_search(self, header):
+        header = self._retrieve_header_map(header)
+        device_id = self._retrieve_device_id(header)
+
+        if device_id is None:
+            return
+        st_header = header.get('st', None)
+        if st_header and st_header in self.registered:
+            if device_id not in self.renderers:
+                device = self.registered[st_header].create_device(header)
+                if device is not None:
+                    self._add_renderer_with_filter_check(device_id, device)
+
+    def process_notify_request(self, header):
+        header = self._retrieve_header_map(header)
+        device_id = self._retrieve_device_id(header)
+
+        if device_id is None:
+            return
+        try:
+            self.lock.acquire()
+            nts_header = header.get('nts', None)
+            nt_header = header.get('nt', None)
+            if nt_header and nts_header and nt_header in self.registered:
+                if (nts_header == self.SSDP_ALIVE and
+                        device_id not in self.renderers):
+                    plugin = self.registered[nt_header]
+                    device = plugin.create_device(header)
+                    if device is not None:
+                        self._add_renderer_with_filter_check(device_id, device)
+                elif (nts_header == self.SSDP_BYEBYE and
+                        device_id in self.renderers):
+                    self._remove_renderer_by_id(device_id)
+        finally:
+            self.lock.release()

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/streamserver.py Added

@@ -0,0 +1,471 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import unicode_literals
+
+import re
+import subprocess
+import threading
+import setproctitle
+import logging
+import time
+import socket
+import select
+import gobject
+import functools
+import atexit
+import json
+import BaseHTTPServer
+import SocketServer
+
+import pulseaudio_dlna.encoders
+import pulseaudio_dlna.recorders
+import pulseaudio_dlna.common
+
+from pulseaudio_dlna.plugins.upnp.renderer import (
+    UpnpContentFeatures, UpnpContentFlags)
+
+logger = logging.getLogger('pulseaudio_dlna.streamserver')
+
+PROTOCOL_VERSION_V10 = 'HTTP/1.0'
+PROTOCOL_VERSION_V11 = 'HTTP/1.1'
+
+
+@functools.total_ordering
+class RemoteDevice(object):
+    def __init__(self, bridge, sock):
+        self.bridge = bridge
+        try:
+            self.ip, self.port = sock.getpeername()
+        except:
+            logger.info('Could not get socket IP and Port. Setting to '
+                        'unknown.')
+            self.ip = 'unknown'
+            self.port = 'unknown'
+
+    def __eq__(self, other):
+        if isinstance(other, RemoteDevice):
+            return self.ip == other.ip
+        raise NotImplementedError
+
+    def __gt__(self, other):
+        if isinstance(other, RemoteDevice):
+            return self.ip > other.ip
+        raise NotImplementedError
+
+
+class ProcessStream(object):
+    def __init__(self, path, recorder, encoder, server):
+        self.path = path
+        self.recorder = recorder
+        self.encoder = encoder
+        self.recorder_process = None
+        self.encoder_process = None
+        self.server = server
+
+        self.sockets = {}
+        self.timeouts = {}
+        self.chunk_size = 1024 * 4
+        self.lock = threading.Lock()
+        self.client_count = 0
+        self.reinitialize_count = 0
+
+        atexit.register(self.shutdown)
+
+        gobject.timeout_add(10000, self._on_regenerate_reinitialize_count)
+
+        class UpdateThread(threading.Thread):
+            def __init__(self, stream):
+                threading.Thread.__init__(self)
+                self.stream = stream
+                self.is_running = False
+                self.lock = threading.Lock()
+                self.lock.acquire()
+
+            def run(self):
+                while True:
+                    if self.is_running is False:
+                        self.lock.acquire()
+                    else:
+                        self.stream.communicate()
+
+            def pause(self):
+                self.is_running = False
+
+            def resume(self):
+                if self.is_running is False:
+                    self.is_running = True
+                    self.lock.release()
+
+        self.update_thread = UpdateThread(self)
+        self.update_thread.daemon = True
+        self.update_thread.start()
+
+    def register(self, bridge, sock, lock_override=False):
+        try:
+            if not lock_override:
+                self.lock.acquire()
+            device = RemoteDevice(bridge, sock)
+            logger.info(
+                'Client {client} registered to stream {path}.'.format(
+                    client=device.ip,
+                    path=self.path))
+            self.sockets[sock] = device
+            self.client_count += 1
+            self.update_thread.resume()
+        finally:
+            if not lock_override:
+                self.lock.release()
+
+    def unregister(self, sock, lock_override=False, method=0):
+        try:
+            if not lock_override:
+                self.lock.acquire()
+            try:
+                device = self.sockets[sock]
+                del self.sockets[sock]
+                sock.close()
+            except KeyError:
+                logger.info('A client id tries to unregister a stream which is '
+                            'not registered, this should never happen...')
+                return
+
+            logger.info(
+                'Client {client} unregistered stream {path} '
+                'using method {method}.'.format(
+                    client=device.ip,
+                    method=method,
+                    path=self.path))
+
+            if device.ip in self.timeouts:
+                gobject.source_remove(self.timeouts[device.ip])
+            self.timeouts[device.ip] = gobject.timeout_add(
+                2000, self._on_delayed_disconnect, device)
+
+            self.client_count -= 1
+        finally:
+            if not lock_override:
+                self.lock.release()
+
+    def _on_regenerate_reinitialize_count(self):
+        if self.reinitialize_count > 0:
+            self.reinitialize_count -= 1
+        return True
+
+    def _on_delayed_disconnect(self, device):
+        self.timeouts.pop(device.ip)
+
+        if len(self.sockets) == 0:
+            logger.info('Stream closed. '
+                        'Cleaning up remaining processes ...')
+            self.update_thread.pause()
+            self.cleanup()
+
+        if device not in self.sockets.values():
+            self.server.message_queue.put(
+                {'type': 'on_bridge_disconnected',
+                         'stopped_bridge': device.bridge})
+        return False
+
+    def communicate(self):
+        try:
+            self.lock.acquire()
+
+            if not self.do_processes_exist():
+                self.create_processes()
+                logger.info(
+                    'Processes of {path} initialized ...'.format(
+                        path=self.path))
+            if not self.do_processes_respond():
+                self.cleanup()
+                self.create_processes()
+                logger.info(
+                    'Processes of {path} reinitialized ...'.format(
+                        path=self.path))
+
+            data = self.encoder_process.stdout.read(self.chunk_size)
+            socks = self.sockets.keys()
+            try:
+                r, w, e = select.select(socks, socks, [], 0)
+            except socket.error:
+                for sock in socks:
+                    try:
+                        r, w, e = select.select([sock], [], [], 0)
+                    except socket.error:
+                        self.unregister(sock, lock_override=True, method=1)
+                return
+
+            for sock in w:
+                try:
+                    self._send_data(sock, data)
+                except socket.error:
+                    self.unregister(sock, lock_override=True, method=2)
+
+            for sock in r:
+                if sock in self.sockets:
+                    try:
+                        data = sock.recv(1024)
+                        if len(data) == 0:
+                            self.unregister(sock, lock_override=True, method=3)
+                    except socket.error:
+                        self.unregister(sock, lock_override=True, method=4)
+
+        finally:
+            self.lock.release()
+
+    def _send_data(self, sock, data):
+        bytes_total = len(data)
+        bytes_sent = 0
+        while bytes_sent < bytes_total:
+            bytes_sent += sock.send(data[bytes_sent:])
+
+    def do_processes_exist(self):
+        return (self.encoder_process is not None and
+                self.recorder_process is not None)
+
+    def do_processes_respond(self):
+        return (self.recorder_process.poll() is None and
+                self.encoder_process.poll() is None)
+
+    def cleanup(self):
+        self._kill_process(self.encoder_process)
+        self._kill_process(self.recorder_process)
+
+    def _kill_process(self, process):
+        try:
+            process.kill()
+        except:
+            pass
+
+    def create_processes(self):
+        if self.reinitialize_count < 3:
+            self.reinitialize_count += 1
+            logger.debug('Starting processes "{recorder} | {encoder}"'.format(
+                recorder=self.recorder.command,
+                encoder=self.encoder.command))
+            self.recorder_process = subprocess.Popen(
+                self.recorder.command.split(' '),
+                stdout=subprocess.PIPE)
+            self.encoder_process = subprocess.Popen(
+                self.encoder.command.split(' '),
+                stdin=self.recorder_process.stdout,
+                stdout=subprocess.PIPE)
+            self.recorder_process.stdout.close()
+        else:
+            self.update_thread.pause()
+            logger.error('There were more than {} attempts to reinitialize '
+                         'the record process. Aborting.'.format(
+                             self.reinitialize_count))
+
+    def shutdown(self, *args):
+        logger.info('Streaming server is shutting down.')
+        for sock in self.sockets.keys():
+            sock.close()
+
+
+class StreamManager(object):
+    def __init__(self, server):
+        self.streams = {}
+        self.server = server
+
+    def get_stream(self, path, bridge, encoder):
+        if path not in self.streams:
+            recorder = pulseaudio_dlna.recorders.PulseaudioRecorder(
+                bridge.sink.monitor)
+            stream = ProcessStream(
+                path,
+                recorder,
+                encoder,
+                self.server,
+            )
+            self.streams[path] = stream
+            return stream
+        else:
+            return self.streams[path]
+
+
+class StreamRequestHandler(BaseHTTPServer.BaseHTTPRequestHandler):
+    def __init__(self, *args):
+        try:
+            BaseHTTPServer.BaseHTTPRequestHandler.__init__(self, *args)
+        except IOError:
+            pass
+
+    def do_HEAD(self):
+        logger.debug('Got the following HEAD request:\n{header}'.format(
+            header=json.dumps(self.headers.items(), indent=2)))
+        self.handle_headers()
+
+    def do_GET(self):
+        logger.debug('Got the following GET request:\n{header}'.format(
+            header=json.dumps(self.headers.items(), indent=2)))
+        bridge, encoder = self.handle_headers()
+        if bridge and encoder:
+            stream = self.server.stream_manager.get_stream(
+                self.path, bridge, encoder)
+            stream.register(bridge, self.request)
+            self.keep_connection_alive()
+
+    def keep_connection_alive(self):
+        self.close_connection = 0
+        self.wfile.flush()
+
+        while True:
+            try:
+                r, w, e = select.select([self.request], [], [], 0)
+            except socket.error:
+                logger.debug('Socket died, releasing request thread.')
+                break
+            time.sleep(1)
+
+    def handle_headers(self):
+        bridge, encoder = self.chop_request_path(self.path)
+        if encoder and bridge:
+            self.send_response(200)
+            headers = {
+                'Content-Type': encoder.mime_type,
+            }
+
+            if self.request_version == PROTOCOL_VERSION_V10:
+                if self.server.fake_http10_content_length:
+                    gb_in_bytes = 1073741824
+                    headers['Content-Length'] = gb_in_bytes * 100
+            elif self.request_version == PROTOCOL_VERSION_V11:
+                headers['Connection'] = 'close'
+
+            if isinstance(
+                bridge.device,
+                    pulseaudio_dlna.plugins.upnp.renderer.UpnpMediaRenderer):
+                content_features = UpnpContentFeatures(
+                    flags=[
+                        UpnpContentFlags.STREAMING_TRANSFER_MODE_SUPPORTED,
+                        UpnpContentFlags.BACKGROUND_TRANSFER_MODE_SUPPORTED,
+                        UpnpContentFlags.CONNECTION_STALLING_SUPPORTED,
+                        UpnpContentFlags.DLNA_VERSION_15_SUPPORTED
+                    ])
+                headers['contentFeatures.dlna.org'] = str(content_features)
+                headers['Ext'] = ''
+                headers['transferMode.dlna.org'] = 'Streaming'
+
+            logger.debug('Sending header:\n{header}'.format(
+                header=json.dumps(headers, indent=2)))
+            for name, value in headers.items():
+                self.send_header(name, value)
+            self.end_headers()
+            return bridge, encoder
+        else:
+            logger.info('Error 404: File not found "{}"'.format(self.path))
+            self.send_error(404, 'File not found: %s' % self.path)
+            return None, None
+
+    def chop_request_path(self, path):
+        logger.info(
+            'Requested streaming URL was: {path} ({version})'.format(
+                path=path,
+                version=self.request_version))
+        try:
+            short_name, suffix = re.findall(r"/(.*?)\.(.*)", path)[0]
+
+            choosen_encoder = None
+            for encoder in pulseaudio_dlna.common.supported_encoders:
+                if encoder.suffix == suffix:
+                    choosen_encoder = encoder
+                    break
+
+            choosen_bridge = None
+            for bridge in self.server.bridges:
+                if short_name == bridge.device.short_name:
+                    choosen_bridge = bridge
+                    break
+
+            if choosen_bridge is not None and choosen_encoder is not None:
+                return bridge, encoder
+
+        except (TypeError, ValueError, IndexError):
+            pass
+        return None, None
+
+    def log_message(self, format, *args):
+        args = [unicode(arg) for arg in args]
+        logger.info('Got request from {host} - {args}' .format(
+            host=self.address_string(),
+            time=self.log_date_time_string(),
+            args=','.join(args)))
+
+
+class StreamServer(SocketServer.TCPServer):
+
+    def __init__(
+            self, ip, port, bridges, message_queue,
+            fake_http10_content_length=False, *args):
+        SocketServer.TCPServer.allow_reuse_address = True
+        SocketServer.TCPServer.__init__(
+            self, ('', port), StreamRequestHandler, *args)
+
+        self.ip = ip
+        self.port = port
+        self.bridges = bridges
+        self.message_queue = message_queue
+        self.stream_manager = StreamManager(self)
+        self.fake_http10_content_length = fake_http10_content_length
+
+    def get_server_url(self):
+        return 'http://{ip}:{port}'.format(
+            ip=self.ip,
+            port=self.port,
+        )
+
+    def run(self):
+        setproctitle.setproctitle('stream_server')
+        self.serve_forever()
+
+
+class GobjectMainLoopMixin:
+
+    def serve_forever(self, poll_interval=0.5):
+        self.mainloop = gobject.MainLoop()
+        gobject.io_add_watch(
+            self, gobject.IO_IN | gobject.IO_PRI, self._on_new_request)
+        context = self.mainloop.get_context()
+        while True:
+            try:
+                if context.pending():
+                    context.iteration(True)
+                else:
+                    time.sleep(0.1)
+            except KeyboardInterrupt:
+                break
+
+    def _on_new_request(self, sock, *args):
+        self._handle_request_noblock()
+        return True
+
+    def shutdown(self, *args):
+        logger.info(
+            'StreamServer GobjectMainLoopMixin.shutdown() pid: {}'.format(
+                os.getpid()))
+        try:
+            self.socket.shutdown(socket.SHUT_RDWR)
+        except socket.error:
+            pass
+        self.socket.close()
+        sys.exit(0)
+
+
+class ThreadedStreamServer(
+        GobjectMainLoopMixin, SocketServer.ThreadingMixIn, StreamServer):
+    pass

pulseaudio-dlna-0.4.1.tar.gz/pulseaudio_dlna/utils/subprocess.py Added

@@ -0,0 +1,102 @@
+#!/usr/bin/python
+
+# This file is part of pulseaudio-dlna.
+
+# pulseaudio-dlna is free software: you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+
+# pulseaudio-dlna is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+
+# You should have received a copy of the GNU General Public License
+# along with pulseaudio-dlna.  If not, see <http://www.gnu.org/licenses/>.
+
+from __future__ import absolute_import
+from __future__ import unicode_literals
+
+import subprocess
+import threading
+import os
+import gobject
+import sys
+
+
+class Subprocess(subprocess.Popen):
+    def __init__(self, cmd, uid=None, gid=None, cwd=None, env=None,
+                 *args, **kwargs):
+
+        self.uid = uid
+        self.gid = gid
+        self.cwd = cwd
+        self.env = env
+
+        super(Subprocess, self).__init__(
+            cmd,
+            preexec_fn=self.demote(uid, gid), cwd=cwd, env=env,
+            stdout=subprocess.PIPE, stderr=subprocess.PIPE,
+            bufsize=1)
+
+    def demote(self, uid, gid):
+        def fn_uid_gid():
+            os.setgid(gid)
+            os.setuid(uid)
+
+        def fn_uid():
+            os.setuid(uid)
+
+        def fn_gid():
+            os.setgid(gid)
+
+        def fn_nop():
+            pass
+
+        if uid and gid:
+            return fn_uid_gid
+        elif uid:
+            return fn_uid
+        elif gid:
+            return fn_gid
+        return fn_nop
+
+
+class GobjectMainLoopMixin(object):
+    def __init__(self, *args, **kwargs):
+        super(GobjectMainLoopMixin, self).__init__(*args, **kwargs)
+        for pipe in [self.stdout, self.stderr]:
+            gobject.io_add_watch(
+                pipe, gobject.IO_IN | gobject.IO_PRI, self._on_new_data)
+
+    def _on_new_data(self, fd, condition):
+        sys.stdout.write(fd.readline().rstrip() + '\n')
+        sys.stdout.flush()
+        return True
+
+
+class ThreadedMixIn(object):
+    def __init__(self, *args, **kwargs):
+        super(ThreadedMixIn, self).__init__(*args, **kwargs)
+        self.init_thread(self.stdout)
+        self.init_thread(self.stderr)
+
+    def init_thread(self, pipe):
+        def read_all(pipe):
+            with pipe:
+                for line in iter(pipe.readline, ''):
+                    sys.stdout.write(line)
+                    sys.stdout.flush()
+
+        t = threading.Thread(target=read_all, args=(pipe, ))
+        t.daemon = True
+        t.start()
+
+
+class ThreadedSubprocess(ThreadedMixIn, Subprocess):
+    pass
+
+
+class GobjectSubprocess(GobjectMainLoopMixin, Subprocess):
+    pass

pulseaudio-dlna-0.3.5.tar.gz/samples/images/pavucontrol-sample.png -> pulseaudio-dlna-0.4.1.tar.gz/samples/images/pavucontrol-sample.png Changed

pulseaudio-dlna-0.3.5.tar.gz/setup.py -> pulseaudio-dlna-0.4.1.tar.gz/setup.py Changed

Build Results
RPM Lint

Refresh

Comments for request 2083 0

Request History

Antoine created request over 9 years ago

Update to 0.4.1.
Waiting for python-notify2 to be available.

olh accepted request over 9 years ago