diff options
Diffstat (limited to 'src')
| -rwxr-xr-x | src/dleyna-control.py (renamed from src/media-service-demo.py) | 2 | ||||
| -rw-r--r-- | src/msd/__init__.py | 2 | ||||
| -rw-r--r-- | src/msd/msd_browse.py | 2 | ||||
| -rw-r--r-- | src/msd/msd_main_window.py | 2 | ||||
| -rw-r--r-- | src/msd/msd_player.py | 2 | ||||
| -rw-r--r-- | src/msd/msd_search.py | 2 | ||||
| -rw-r--r-- | src/msd/msd_sort_order.py | 2 | ||||
| -rw-r--r-- | src/msd/msd_upnp.py | 25 | ||||
| -rw-r--r-- | src/msd/msd_utils.py | 2 |
9 files changed, 20 insertions, 21 deletions
diff --git a/src/media-service-demo.py b/src/dleyna-control.py index 3901c45..5ef0973 100755 --- a/src/media-service-demo.py +++ b/src/dleyna-control.py @@ -1,6 +1,6 @@ #!/usr/bin/env python -# media-service-demo +# dleyna-control # # Copyright (C) 2012 Intel Corporation. All rights reserved. # diff --git a/src/msd/__init__.py b/src/msd/__init__.py index 64ce8ef..b75ae01 100644 --- a/src/msd/__init__.py +++ b/src/msd/__init__.py @@ -1,4 +1,4 @@ -# media-service-demo +# dleyna-control # # Copyright (C) 2012 Intel Corporation. All rights reserved. # diff --git a/src/msd/msd_browse.py b/src/msd/msd_browse.py index d0d42dc..1c1b087 100644 --- a/src/msd/msd_browse.py +++ b/src/msd/msd_browse.py @@ -1,4 +1,4 @@ -# media-service-demo +# dleyna-control # # Copyright (C) 2012 Intel Corporation. All rights reserved. # diff --git a/src/msd/msd_main_window.py b/src/msd/msd_main_window.py index 62c3b29..e72c344 100644 --- a/src/msd/msd_main_window.py +++ b/src/msd/msd_main_window.py @@ -1,4 +1,4 @@ -# media-service-demo +# dleyna-control # # Copyright (C) 2012 Intel Corporation. All rights reserved. # diff --git a/src/msd/msd_player.py b/src/msd/msd_player.py index 50c6572..a5ecefd 100644 --- a/src/msd/msd_player.py +++ b/src/msd/msd_player.py @@ -1,4 +1,4 @@ -# media-service-demo +# dleyna-control # # Copyright (C) 2012 Intel Corporation. All rights reserved. # diff --git a/src/msd/msd_search.py b/src/msd/msd_search.py index 8a0f5a0..caa0d3c 100644 --- a/src/msd/msd_search.py +++ b/src/msd/msd_search.py @@ -1,4 +1,4 @@ -# media-service-demo +# dleyna-control # # Copyright (C) 2012 Intel Corporation. All rights reserved. # diff --git a/src/msd/msd_sort_order.py b/src/msd/msd_sort_order.py index 5b94bca..0347021 100644 --- a/src/msd/msd_sort_order.py +++ b/src/msd/msd_sort_order.py @@ -1,4 +1,4 @@ -# media-service-demo +# dleyna-control # # Copyright (C) 2012 Intel Corporation. All rights reserved. # diff --git a/src/msd/msd_upnp.py b/src/msd/msd_upnp.py index c2e83cc..f2bba50 100644 --- a/src/msd/msd_upnp.py +++ b/src/msd/msd_upnp.py @@ -1,4 +1,4 @@ -# media-service-demo +# dleyna-control # # Copyright (C) 2012 Intel Corporation. All rights reserved. # @@ -22,12 +22,13 @@ from msd_utils import * import dbus import os +DLEYNA_SERVER_DBUS_NAME = 'com.intel.dleyna-server' + class MediaObject(object): def __init__(self, path): - bus = dbus.SessionBus() - self.__propsIF = dbus.Interface(bus.get_object( - 'com.intel.media-service-upnp', path), + obj = dbus.SessionBus().get_object(DLEYNA_SERVER_DBUS_NAME, path) + self.__propsIF = dbus.Interface(obj, 'org.freedesktop.DBus.Properties') def get_prop(self, prop_name, iface = ""): return self.__propsIF.Get(iface, prop_name) @@ -36,10 +37,9 @@ class Container(MediaObject): def __init__(self, path): MediaObject.__init__(self, path) - bus = dbus.SessionBus() - self.__containerIF = dbus.Interface(bus.get_object( - 'com.intel.media-service-upnp', path), - 'org.gnome.UPnP.MediaContainer2') + obj = dbus.SessionBus().get_object(DLEYNA_SERVER_DBUS_NAME, path) + self.__containerIF = dbus.Interface(obj, + 'org.gnome.UPnP.MediaContainer2') def search(self, query, offset, count, fltr, sort=""): return self.__containerIF.SearchObjectsEx(query, offset, count, fltr, @@ -86,11 +86,10 @@ class State(object): self.__lost_server_cb(path) def __init__(self): - bus = dbus.SessionBus() - self.__manager = dbus.Interface(bus.get_object( - 'com.intel.media-service-upnp', - '/com/intel/MediaServiceUPnP'), - 'com.intel.MediaServiceUPnP.Manager') + obj = dbus.SessionBus().get_object(DLEYNA_SERVER_DBUS_NAME, + '/com/intel/dLeynaServer') + self.__manager = dbus.Interface(obj, + 'com.intel.dLeynaServer.Manager') self.__servers = {} self.__found_server_cb = None self.__lost_server_cb = None diff --git a/src/msd/msd_utils.py b/src/msd/msd_utils.py index cc21bfa..e55d17d 100644 --- a/src/msd/msd_utils.py +++ b/src/msd/msd_utils.py @@ -1,4 +1,4 @@ -# media-service-demo +# dleyna-control # # Copyright (C) 2012 Intel Corporation. All rights reserved. # |