[General] Initial Commit

Signed-off-by: Mark Ryan <mark.d.ryan@intel.com>

9 files changed, 1255 insertions, 0 deletions

diff --git a/src/media-service-demo.py b/src/media-service-demo.py
new file mode 100755
index 0000000..3901c45
--- /dev/null
+++ b/src/media-service-demo.py
@@ -0,0 +1,42 @@
+#!/usr/bin/env python
+
+# media-service-demo
+#
+# Copyright (C) 2012 Intel Corporation. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU Lesser General Public License,
+# version 2.1, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Mark Ryan <mark.d.ryan@intel.com>
+#
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import glib
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+
+from msd.msd_main_window import *
+
+if __name__ == "__main__":
+    gtk.gdk.threads_init()
+    try:
+        del os.environ["http_proxy"];
+    except Exception, e:
+        pass
+    dbus.mainloop.glib.DBusGMainLoop(set_as_default=True)
+    state = State()
+    main_window = MainWindow(state)
+    gtk.main()
diff --git a/src/msd/__init__.py b/src/msd/__init__.py
new file mode 100644
index 0000000..64ce8ef
--- /dev/null
+++ b/src/msd/__init__.py
@@ -0,0 +1,19 @@
+# media-service-demo
+#
+# Copyright (C) 2012 Intel Corporation. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU Lesser General Public License,
+# version 2.1, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Mark Ryan <mark.d.ryan@intel.com>
+#
diff --git a/src/msd/msd_browse.py b/src/msd/msd_browse.py
new file mode 100644
index 0000000..d0d42dc
--- /dev/null
+++ b/src/msd/msd_browse.py
@@ -0,0 +1,234 @@
+# media-service-demo
+#
+# Copyright (C) 2012 Intel Corporation. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU Lesser General Public License,
+# version 2.1, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Mark Ryan <mark.d.ryan@intel.com>
+#
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import dateutil.parser
+import datetime
+
+from msd_sort_order import *
+from msd_upnp import *
+
+class TreeNode(object):
+
+    filter = ["Artist", "DisplayName", "URLs", "Date", "Path",
+              "Type"]
+    buffer_size = 50
+
+    def __init__(self, props, parent, sort_order):
+        self.__props = props
+        self.__container = None
+        self.__max_items = 0
+        self.__parent = parent
+        self.__sort_order = sort_order
+        if self.is_container():
+            self.__container = Container(props["Path"])
+            try:
+                self.__max_items = self.__container.get_prop("ChildCount")
+            except Exception:
+                pass
+        self.__children = [None] * self.__max_items
+
+    def is_container(self):
+        return self.__props["Type"] == "container"
+
+    def reset_children(self):
+        self.__children = [None] * self.__max_items
+
+    def get_num_children(self):
+        return self.__max_items
+
+    def get_props(self):
+        return self.__props
+
+    def get_parent(self):
+        return self.__parent
+
+    def flush(self):
+        self.__flush_down()
+        if self.__parent:
+            self.__parent.__flush_up(self)
+
+    def __flush_down(self):
+        i = 0;
+        while i < self.__max_items:
+            if self.__children[i]:
+                self.__children[i].__flush_down()
+                self.__children[i] = None
+            i = i + 1
+
+    def __flush_up(self, child):
+        i = 0;
+        while i < self.__max_items:
+            if self.__children[i]:
+                if child != self.__children[i]:
+                    self.__children[i].__flush_down()
+                self.__children[i] = None
+            i = i + 1
+        if self.__parent:
+            self.__parent.__flush_up(self)
+
+    def get_child(self, child):
+        retval = None
+        if child < self.__max_items:
+            retval = self.__children[child]
+            if not retval:
+                i = child + 1
+                while (i < self.__max_items and (i - child) <
+                       TreeNode.buffer_size and not self.__children[i]):
+                    i = i + 1
+                try:
+                    sort_descriptor = self.__sort_order.get_upnp_sort_order()
+                    try:
+                        result = self.__container.list_children(child,
+                                                                i - child,
+                                                                TreeNode.filter,
+                                                                sort_descriptor)
+                    except Exception:
+                        result = self.__container.list_children(child,
+                                                                i - child,
+                                                                TreeNode.filter)
+                    i = child
+                    for props in result:
+                        self.__children[i] = TreeNode(props, self,
+                                                      self.__sort_order)
+                        i = i + 1
+                    retval = self.__children[child]
+                except Exception:
+                    pass
+
+        return retval
+
+class BrowseModel(gtk.GenericTreeModel):
+    columns = (("DisplayName", str), ("Artist", str), ("Date", str),
+               ("Type",str), ("Path", str), ("URLs", str))
+
+    def __init__(self, root):
+        gtk.GenericTreeModel.__init__(self)
+
+        self.__root = root
+
+    def flush(self):
+        self.__root.flush()
+
+    def on_get_flags(self):
+        return gtk.TREE_MODEL_LIST_ONLY | gtk.TREE_MODEL_ITERS_PERSIST
+
+    def on_get_n_columns(self):
+        return len(BrowseModel.columns)
+
+    def on_get_column_type(self, n):
+        return BrowseModel.columns[n][1]
+
+    def __get_num_of_children(self):
+        num = self.__root.get_num_children()
+        if self.__root.get_parent():
+            num = num + 1
+        return num
+
+    def on_get_iter(self, path):
+        if path[0] >= self.__get_num_of_children():
+            raise ValueError("Invalid Path")
+        return path[0]
+
+    def on_get_path(self, rowref):
+        return (rowref,)
+
+    def adjusted_on_get_value(self, rowref, col):
+        retval = None
+        key = BrowseModel.columns[col][0]
+        node = self.__root.get_child(rowref)
+        props = node.get_props()
+        if key in props:
+            data = props[key]
+            if node.is_container():
+                if col == 0:
+                    retval = data
+            else:
+                if col == 2:
+                    date = dateutil.parser.parse(data)
+                    retval = date.strftime("%x")
+                elif col == 3:
+                    data = data[0].upper() + data[1:]
+                    period = data.find('.')
+                    if period >=0:
+                        retval = data[:period]
+                    else:
+                        retval = data
+                elif col == 5:
+                    retval = data[0]
+                else:
+                    retval = data
+        elif not node.is_container():
+            if col == 1:
+                retval = "Unknown"
+            elif col == 2:
+                retval = datetime.date.today().strftime("%x")
+            else:
+                retval = ""
+
+        return retval
+
+    def on_get_value(self, rowref, col):
+        if self.__root.get_parent():
+            if rowref == 0:
+                if col == 0:
+                    retval = ".."
+                else:
+                    retval = ""
+            else:
+                retval = self.adjusted_on_get_value(rowref - 1, col)
+        else:
+            retval = self.adjusted_on_get_value(rowref, col)
+
+        return retval
+
+    def on_iter_next(self, rowref):
+        retval = None
+        rowref = rowref + 1
+        if rowref < self.__get_num_of_children():
+            retval =  rowref
+
+        return retval
+
+    def on_iter_children(self, rowref):
+        retval = 0
+        if rowref:
+            retval =  None
+        return retval
+
+    def on_iter_has_child(self, rowref):
+        return False
+
+    def on_iter_n_children(self, rowref):
+        retval = 0
+        if not rowref:
+            retval = self.__get_num_of_children()
+        return retval
+
+    def on_iter_nth_child(self, rowref, child):
+        retval = None
+        if not rowref and child < self.__get_num_of_children():
+            retval = child
+        return retval
+
+    def on_iter_parent(self, rowref):
+        return None
diff --git a/src/msd/msd_main_window.py b/src/msd/msd_main_window.py
new file mode 100644
index 0000000..62c3b29
--- /dev/null
+++ b/src/msd/msd_main_window.py
@@ -0,0 +1,320 @@
+# media-service-demo
+#
+# Copyright (C) 2012 Intel Corporation. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU Lesser General Public License,
+# version 2.1, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Mark Ryan <mark.d.ryan@intel.com>
+#
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import glib
+import dbus
+import dbus.service
+import dbus.mainloop.glib
+import os
+
+from msd_utils import *
+from msd_upnp import *
+from msd_search import *
+from msd_browse import *
+from msd_player import *
+
+class MainWindow(object):
+
+    container_padding = 2
+
+    def delete_event(self, widget, event, data=None):
+        return False
+
+    def destroy(self, widget, data=None):
+        if self.__overlay:
+            self.__overlay.cancel_playback()
+        gtk.main_quit()
+
+    def __append_server_list_row(self, list_store, key, value):
+        name, image = value
+        if image:
+            image = image.get_pixbuf()
+            image = image.scale_simple(32, 32, gtk.gdk.INTERP_BILINEAR)
+        return list_store.append([image, name, key])
+
+    def __create_server_list_store(self):
+        list_store = gtk.ListStore(gtk.gdk.Pixbuf, str, str)
+        for key, value in self.__state.get_server_list().iteritems():
+            self.__append_server_list_row(list_store, key, value)
+        return list_store
+
+    def __change_server(self, page, sel):
+        model, row = sel.get_selected()
+        if row != None:
+            path = model.get_value(row, 2)
+            if page == 0:
+                if self.__search_path != path:
+                    search_model =  SearchModel(Container(path),
+                                                self.__search_entry.get_text(),
+                                                self.__images.get_active(),
+                                                self.__videos.get_active(),
+                                                self.__music.get_active(),
+                                                self.__sort_order)
+                    self.__search_view.set_model(search_model)
+                    self.__search_path = path
+            elif self.__browse_path != path:
+                props = { "Path" : path, "Type": "container" }
+                self.__browse_tree = TreeNode(props, None, self.__sort_order)
+                browse_model = BrowseModel(self.__browse_tree)
+                self.__browse_node = self.__browse_tree
+                self.__browse_view.set_model(browse_model)
+                self.__browse_path = path
+
+    def __server_selected(self, sel):
+        page = self.__notebook.get_current_page()
+        self.__change_server(page, sel)
+
+    def __select_server(self, rowref):
+        selection = self.__server_view.get_selection()
+        if selection.count_selected_rows() == 0:
+            liststore = self.__server_view.get_model()
+            selection = self.__server_view.get_selection()
+            selection.select_iter(rowref)
+            self.__server_view.set_cursor(liststore.get_path(rowref))
+
+    def __create_server_list(self, table):
+        liststore = self.__create_server_list_store()
+        treeview = gtk.TreeView(liststore)
+        treeview.set_headers_visible(True)
+
+        column = gtk.TreeViewColumn()
+        column.set_title("Servers")
+        renderer = gtk.CellRendererPixbuf()
+        column.pack_start(renderer, expand=False)
+        column.add_attribute(renderer, 'pixbuf', 0)
+        renderer = gtk.CellRendererText()
+        column.pack_start(renderer, expand=False)
+        column.add_attribute(renderer, 'text', 1)
+        treeview.append_column(column)
+
+        treeview.set_headers_clickable(True)
+
+        treeview.get_selection().connect("changed", self.__server_selected)
+
+        scrollwin = gtk.ScrolledWindow()
+        scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC);
+        scrollwin.add(treeview)
+        table.attach(scrollwin, left_attach=0, right_attach=1,
+                     top_attach=0, bottom_attach=1)
+        self.__server_view = treeview;
+
+    def __column_clicked(self, column, sort_by):
+        self.__sort_order.set_sort_by(sort_by)
+        tv = column.get_tree_view()
+        model = tv.get_model()
+        model.flush()
+        tv.set_model(None)
+        tv.set_model(model)
+
+    def __create_column(self, treeview, name, col, width, sort_by):
+        renderer = gtk.CellRendererText()
+        column = gtk.TreeViewColumn(name, renderer)
+        column.set_sizing(gtk.TREE_VIEW_COLUMN_FIXED)
+        column.set_fixed_width(width)
+        column.add_attribute(renderer, 'text', col)
+        column.connect("clicked", self.__column_clicked, sort_by)
+        treeview.append_column(column)
+
+    def __close_overlay(self):
+        self.__window.remove(self.__overlay.get_container())
+        self.__window.add(self.__main_view)
+        self.__overlay = None
+
+    def __content_clicked(self, treeview, path, col):
+        model = treeview.get_model()
+        rowref = model.get_iter(path)
+        name = model.get_value(rowref, 0)
+        ctype = model.get_value(rowref, 3)
+        path = model.get_value(rowref, 4)
+        url = model.get_value(rowref, 5)
+
+        if url != "":
+            if ctype == "Image":
+                self.__window.remove(self.__main_view)
+                self.__overlay = PlayWindowImage(name, url,
+                                                 self.__close_overlay)
+                self.__window.add(self.__overlay.get_container())
+            elif ctype == "Video":
+                self.__window.remove(self.__main_view)
+                self.__overlay = PlayWindowVideo(name, url,
+                                                 self.__close_overlay)
+                self.__window.add(self.__overlay.get_container())
+            elif ctype == "Audio":
+                try:
+                    album_art_url = MediaObject(path).get_prop("AlbumArtURL")
+                except Exception:
+                    album_art_url = None
+                self.__window.remove(self.__main_view)
+                self.__overlay = PlayWindowAudio(name, url, album_art_url,
+                                                 self.__close_overlay)
+                self.__window.add(self.__overlay.get_container())
+
+    def __browse_content_clicked(self, treeview, path, col):
+        if self.__browse_node != self.__browse_tree and path[0] == 0:
+            self.__browse_node.reset_children()
+            self.__browse_node = self.__browse_node.get_parent()
+            browse_model = BrowseModel(self.__browse_node)
+            self.__browse_view.set_model(browse_model)
+        else:
+            child = path[0]
+            if self.__browse_node != self.__browse_tree:
+                child = child - 1
+            node = self.__browse_node.get_child(child)
+            if node.is_container():
+                self.__browse_node = node
+                browse_model = BrowseModel(self.__browse_node)
+                self.__browse_view.set_model(browse_model)
+            else:
+                self.__content_clicked(treeview, path, col)
+
+    def __create_common_list(self, store):
+        treeview = gtk.TreeView(store)
+        treeview.set_headers_visible(True)
+        treeview.set_fixed_height_mode(True)
+
+        self.__create_column(treeview, "Title", 0, 300, "DisplayName")
+        self.__create_column(treeview, "Date", 2, 100, "Date")
+        self.__create_column(treeview, "Type", 3, 75, "Type")
+        self.__create_column(treeview, "Author", 1, 100, "Artist")
+
+        treeview.set_headers_clickable(True)
+        treeview.set_rules_hint(True)
+
+        scrollwin = gtk.ScrolledWindow()
+        scrollwin.set_policy(gtk.POLICY_AUTOMATIC, gtk.POLICY_AUTOMATIC);
+        scrollwin.add(treeview)
+        return (scrollwin, treeview)
+
+    def __create_browse_view(self, notebook):
+        tree_store = gtk.TreeStore(str, str, str, str)
+        scrollwin, treeview = self.__create_common_list(tree_store)
+        treeview.connect("row-activated", self.__browse_content_clicked)
+        self.__browse_view = treeview;
+        notebook.append_page(scrollwin, gtk.Label("Browse"))
+
+    def __create_search_list(self, container):
+        list_store = gtk.ListStore(str, str, str, str)
+        scrollwin, treeview = self.__create_common_list(list_store)
+        container.pack_start(scrollwin, True, True, 0)
+        treeview.connect("row-activated", self.__content_clicked)
+        self.__search_view = treeview;
+
+    def __search_criteria_changed(self, obj):
+        self.__search_path = None
+        self.__server_selected(self.__server_view.get_selection())
+
+    def __create_check_box(self, title, container):
+        cb = gtk.CheckButton(title)
+        cb.set_active(True)
+        cb.connect("toggled", self.__search_criteria_changed)
+        container.pack_start(cb, True, True, MainWindow.container_padding)
+        return cb
+
+    def __create_search_controls(self, container):
+        label = gtk.Label("Search: ")
+        self.__search_entry = gtk.Entry()
+        self.__search_entry.set_text("")
+        self.__search_entry.connect("activate", self.__search_criteria_changed)
+        container.pack_start(label, True, True, MainWindow.container_padding)
+        container.pack_start(self.__search_entry, True, True,
+                              MainWindow.container_padding)
+        self.__music = self.__create_check_box("Music", container)
+        self.__images = self.__create_check_box("Images", container)
+        self.__videos = self.__create_check_box("Video", container)
+
+    def __create_search_view(self, notebook):
+        vbox = gtk.VBox(False, 0)
+        hbox = gtk.HBox(True, 0)
+        self.__create_search_list(vbox)
+        self.__create_search_controls(hbox)
+        vbox.pack_start(hbox, False, True, MainWindow.container_padding)
+        notebook.append_page(vbox, gtk.Label("Search"))
+
+    def __page_changed(self, notebook, page, page_number):
+        sel = self.__server_view.get_selection()
+        if sel:
+            self.__change_server(page_number, sel)
+
+    def __create_notebook(self, table):
+        notebook = gtk.Notebook()
+        self.__create_search_view(notebook)
+        self.__create_browse_view(notebook)
+        notebook.connect("switch-page", self.__page_changed)
+        table.attach(notebook, left_attach=1, right_attach=4,
+                     top_attach=0, bottom_attach=1)
+        self.__notebook = notebook
+
+    def __create_widgets(self, window):
+        table = gtk.Table(rows=1, columns=4, homogeneous=True)
+        self.__create_server_list(table)
+        self.__create_notebook(table)
+        window.add(table)
+        self.__main_view = table
+
+    def __create_window(self):
+        window = gtk.Window(gtk.WINDOW_TOPLEVEL)
+        window.set_title("Media Service Demo")
+        window.set_resizable(True)
+        window.set_default_size(640, 480)
+        window.connect("delete_event", self.delete_event)
+        window.connect("destroy", self.destroy)
+        self.__create_widgets(window)
+        window.show_all()
+        self.__window = window
+
+    def __found_server(self, path):
+        liststore = self.__server_view.get_model()
+        value = self.__state.get_server_list()[path]
+        rowref = self.__append_server_list_row(liststore, path, value)
+        self.__select_server(rowref)
+
+    def __lost_server(self, path):
+        liststore = self.__server_view.get_model()
+        rowref = liststore.get_iter_first()
+        while rowref and liststore.get_value(rowref, 2) != path:
+            rowref = liststore.iter_next(rowref)
+        if rowref:
+            path_to_delete = liststore.get_path(rowref)
+            selection = self.__server_view.get_selection()
+            selected_path = liststore.get_path(selection.get_selected()[1])
+            liststore.remove(rowref)
+            if path_to_delete == selected_path:
+                rowref = liststore.get_iter_first()
+                if rowref:
+                    selection.select_iter(rowref)
+                    self.__server_view.set_cursor(liststore.get_path(rowref))
+
+    def __init__(self, state):
+        self.__search_path = None
+        self.__browse_path = None
+        self.__state = state
+        self.__state.set_lost_server_cb(self.__lost_server)
+        self.__state.set_found_server_cb(self.__found_server)
+        self.__create_window()
+        self.__overlay = None
+        self.__sort_order = SortOrder()
+
+        liststore = self.__server_view.get_model()
+        rowref = liststore.get_iter_first()
+        if rowref:
+            self.__select_server(rowref)
diff --git a/src/msd/msd_player.py b/src/msd/msd_player.py
new file mode 100644
index 0000000..50c6572
--- /dev/null
+++ b/src/msd/msd_player.py
@@ -0,0 +1,257 @@
+# media-service-demo
+#
+# Copyright (C) 2012 Intel Corporation. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU Lesser General Public License,
+# version 2.1, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Mark Ryan <mark.d.ryan@intel.com>
+#
+
+import pygtk
+pygtk.require('2.0')
+import glib
+import gtk
+import pygst
+pygst.require("0.10")
+import gst
+import datetime
+
+from msd_utils import *
+
+class PlayWindowBase(object):
+
+    def __init__(self, name, url, close_window):
+        self.__name = name
+        self.__url  = url
+        self.__close_window = close_window
+
+        self.__container = gtk.VBox(False, 0)
+        self.drawing_area = gtk.DrawingArea()
+        self.private_area = gtk.VBox(True, 0)
+        self.ok_button = gtk.Button("Close")
+        self.ok_button.connect("clicked", self.quit)
+        self.__container.pack_start(self.drawing_area, True, True, 0)
+        self.__container.pack_start(self.private_area, False, False, 0)
+        self.__container.pack_start(self.ok_button, False, False, 0)
+
+    def quit(self, button):
+        self.__close_window()
+
+    def get_container(self):
+        return self.__container
+
+    def cancel_playback(self):
+        pass
+
+    def draw_image(self, image):
+        x = 0
+        y = 0
+        gc = self.drawing_area.get_style().fg_gc[gtk.STATE_NORMAL]
+        rect = self.drawing_area.get_allocation()
+        width_scale = image.get_width() / float(rect.width)
+        height_scale = image.get_height() / float(rect.height)
+        if ((width_scale < 1.0 and height_scale < 1.0) or
+            (width_scale >= 1.0 and height_scale >= 1.0)):
+            if width_scale < height_scale:
+                divisor = height_scale
+                x = (rect.width - int(image.get_width() / divisor)) / 2
+            else:
+                divisor = width_scale
+                y = (rect.height - int(image.get_height() / divisor)) / 2
+        elif width_scale > 1.0:
+            divisor = width_scale
+            y = (rect.height - int(image.get_height() / divisor)) / 2
+        else:
+            divisor = height_scale
+            x = (rect.width - int(image.get_width() / divisor)) / 2
+
+        scaled_image = image.scale_simple(int(image.get_width() / divisor),
+                                          int(image.get_height() / divisor),
+                                          gtk.gdk.INTERP_BILINEAR)
+        self.drawing_area.window.draw_pixbuf(gc, scaled_image, 0, 0, x,
+                                             y, -1, -1)
+
+
+class PlayWindowImage(PlayWindowBase):
+
+    def __init__(self, name, url, close_window):
+        PlayWindowBase.__init__(self, name, url, close_window)
+        try:
+            image = image_from_file(url)
+            self.__image = image.get_pixbuf()
+            self.drawing_area.connect("expose-event", self.__draw)
+        except Exception:
+            pass
+
+        self.get_container().show_all()
+
+    def __draw(self, area, event):
+        self.draw_image(self.__image)
+        return True
+
+class GStreamerWindow(PlayWindowBase):
+
+    def __init__(self, name, url, close_window):
+        PlayWindowBase.__init__(self, name, url, close_window)
+
+        self.player = gst.element_factory_make("playbin2", "player")
+        gsbus = self.player.get_bus()
+        gsbus.add_signal_watch()
+        gsbus.connect("message", self.gs_message_cb)
+
+        self.player.set_property("uri", url)
+
+        button_bar = gtk.HBox(True, 0)
+
+        self.__stop_button = gtk.Button("Stop")
+        self.__stop_button.connect("clicked", self.__stop)
+        self.__pause_button = gtk.Button("Pause")
+        self.__pause_button.connect("clicked", self.__pause)
+        self.__start_button = gtk.Button("Play")
+        self.__start_button.connect("clicked", self.__start)
+        self.__start_button.set_sensitive(False)
+
+        self.__scale = gtk.HScale()
+
+        button_bar.pack_start(self.__start_button, True, True, 0)
+        button_bar.pack_start(self.__pause_button, True, True, 0)
+        button_bar.pack_start(self.__stop_button, True, True, 0)
+
+        self.private_area.pack_start(self.__scale, False, False, 0)
+        self.private_area.pack_start(button_bar, False, False, 0)
+
+        self.get_container().show_all()
+        self.__scale.hide()
+        self.__duration = -1
+        self.__update_pos_id = 0
+        self.__adjustment = None
+        self.player.set_state(gst.STATE_PLAYING)
+
+    def __stop_or_pause(self):
+        self.__pause_button.set_sensitive(False)
+        self.__start_button.set_sensitive(True)
+        self.__scale.set_sensitive(True)
+        if self.__update_pos_id != 0:
+            glib.source_remove(self.__update_pos_id)
+            self.__update_pos_id = 0
+
+    def __stop(self, button):
+        self.player.set_state(gst.STATE_NULL)
+        self.__stop_button.set_sensitive(False)
+        self.__stop_or_pause()
+        if self.__adjustment:
+            self.__adjustment.set_value(0)
+
+    def __start(self, button):
+        self.player.set_state(gst.STATE_PLAYING)
+        self.__scale.set_sensitive(False)
+        self.__start_button.set_sensitive(False)
+        self.__pause_button.set_sensitive(True)
+        self.__stop_button.set_sensitive(True)
+
+    def __pause(self, button):
+        self.player.set_state(gst.STATE_PAUSED)
+        self.__stop_or_pause()
+
+    def __update_pos(self, user_data):
+        try:
+            pos = self.player.query_position(gst.FORMAT_TIME, None)[0]
+            if pos != -1:
+                pos = pos / 1000000000.0
+                self.__adjustment.set_value(pos)
+        except Exception:
+            pass
+        return True
+
+    def cancel_playback(self):
+        self.player.set_state(gst.STATE_NULL)
+
+    def quit(self, button):
+        self.player.set_state(gst.STATE_NULL)
+        PlayWindowBase.quit(self, button)
+
+    def __adjusted(self, adjustment):
+        (ret, state, pending) = self.player.get_state()
+        if state != gst.STATE_PLAYING:
+            seek_pos = adjustment.get_value() * 1000000000
+            self.player.seek_simple(gst.FORMAT_TIME, gst.SEEK_FLAG_FLUSH,
+                                      seek_pos)
+
+    def __format_time(self, scale, value):
+        pos = int(self.__adjustment.get_value())
+        return str(datetime.timedelta(seconds=pos))
+
+    def gs_message_cb(self, bus, message):
+        if message.type == gst.MESSAGE_EOS or message.type == gst.MESSAGE_ERROR:
+            self.__stop(None)
+        elif message.type == gst.MESSAGE_STATE_CHANGED:
+            (old, state, pending) =  message.parse_state_changed()
+            if self.__duration == -1 and (state == gst.STATE_PLAYING or
+                                          state == gst.STATE_PAUSED):
+               try:
+                   duration = self.player.query_duration(gst.FORMAT_TIME,
+                                        None)[0]
+                   if duration != -1:
+                       self.__duration  = duration / 1000000000
+                       self.__adjustment = gtk.Adjustment(0, 0,
+                                                          self.__duration,
+                                                          .5, .5, 0)
+                       self.__scale.set_adjustment(self.__adjustment)
+                       self.__scale.set_sensitive(False)
+                       self.__adjustment.connect("value-changed",
+                                                 self.__adjusted)
+                       self.__scale.connect("format-value", self.__format_time)
+                       self.__scale.show()
+               except Exception:
+                   pass
+
+            if state == gst.STATE_PLAYING and self.__update_pos_id == 0:
+                self.__update_pos_id = glib.timeout_add(500,
+                                                        self.__update_pos,
+                                                        None)
+
+class PlayWindowAudio(GStreamerWindow):
+
+    def __init__(self, name, url, album_art_url, close_window):
+        GStreamerWindow.__init__(self, name, url, close_window)
+
+        if album_art_url:
+            try:
+                image = image_from_file(album_art_url)
+                self.__image = image.get_pixbuf()
+                self.drawing_area.connect("expose-event", self.__draw)
+            except Exception:
+                pass
+
+    def __draw(self, area, event):
+        self.draw_image(self.__image)
+        return True
+
+class PlayWindowVideo(GStreamerWindow):
+
+    def __init__(self, name, url, close_window):
+        GStreamerWindow.__init__(self, name, url, close_window)
+
+        gsbus = self.player.get_bus()
+        gsbus.enable_sync_message_emission()
+        gsbus.connect("sync-message::element", self.gs_sync_message_cb)
+
+
+    def gs_sync_message_cb(self, bus, message):
+        if message.structure != None and (message.structure.get_name() ==
+                                          "prepare-xwindow-id"):
+            message.src.set_property("force-aspect-ratio", True)
+            gtk.gdk.threads_enter()
+            message.src.set_xwindow_id(self.drawing_area.window.xid)
+            gtk.gdk.threads_leave()
diff --git a/src/msd/msd_search.py b/src/msd/msd_search.py
new file mode 100644
index 0000000..f5aa0bf
--- /dev/null
+++ b/src/msd/msd_search.py
@@ -0,0 +1,195 @@
+# media-service-demo
+#
+# Copyright (C) 2012 Intel Corporation. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU Lesser General Public License,
+# version 2.1, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Mark Ryan <mark.d.ryan@intel.com>
+#
+
+import pygtk
+pygtk.require('2.0')
+import gtk
+import cStringIO
+import dateutil.parser
+import datetime
+
+from msd_sort_order import *
+from msd_upnp import *
+
+class SearchModel(gtk.GenericTreeModel):
+    columns = (("DisplayName", str), ("Artist", str), ("Date", str),
+               ("Type",str), ("Path", str), ("URLs", str))
+    filter = ["Artist", "DisplayName", "URLs", "Date", "Path",
+              "Type"]
+
+    buffer_size = 50
+
+    @staticmethod
+    def __create_query_string(query, images, videos, music):
+        search_string = None
+
+        if images or videos or music:
+            q_buffer = cStringIO.StringIO()
+            try:
+                if query != "":
+                    q_buffer.write('(Artist contains "{0}"\
+ or DisplayName contains "{0}")'.format(query))
+                    q_buffer.write(' and ')
+                q_buffer.write(' ( ')
+                if images:
+                    q_buffer.write('Type derivedfrom "image" ')
+                if videos:
+                    if images:
+                        q_buffer.write(' or ')
+                    q_buffer.write('Type derivedfrom "video" ')
+                if music:
+                    if images or videos:
+                        q_buffer.write(' or ')
+                    q_buffer.write('Type derivedfrom "audio" ')
+                q_buffer.write(' )')
+                search_string = q_buffer.getvalue()
+            finally:
+                q_buffer.close()
+
+        return search_string
+
+    def __get_search_items(self, start, count):
+        if self.__items:
+            end = start
+            while (end < start + SearchModel.buffer_size and
+                   end < self.__max_items and not self.__items[end]):
+                end = end + 1
+        else:
+            end = count
+
+        if start < end:
+            count = end - start
+            try:
+                sort_descriptor = self.__sort_order.get_upnp_sort_order()
+                items, max_items = self.__root.search(self.__search_string,
+                                                      start, count,
+                                                      SearchModel.filter,
+                                                      sort_descriptor)
+
+                max_items = max(max_items, len(items))
+
+                # TODO: I need to inform list view if max item has changed?
+
+                if max_items != self.__max_items:
+                    self.__max_items = max_items
+                    self.__items = [None] * self.__max_items
+                for item in items:
+                    self.__items[start] = item
+                    start = start + 1
+            except Exception:
+                pass
+
+    def __init__(self, root, query, images, videos, music, sort_order):
+        gtk.GenericTreeModel.__init__(self)
+
+        self.__items = None
+        self.__max_items = 0
+        self.__root = root
+        self.__sort_order = sort_order
+        self.__search_string = SearchModel.__create_query_string(query, images,
+                                                                 videos, music)
+        if self.__search_string:
+            self.__get_search_items(0, SearchModel.buffer_size)
+
+    def flush(self):
+        i = 0
+        while i < self.__max_items:
+            self.__items[i] = None
+            i = i + 1
+
+    def on_get_flags(self):
+        return gtk.TREE_MODEL_LIST_ONLY | gtk.TREE_MODEL_ITERS_PERSIST
+
+    def on_get_n_columns(self):
+        return len(SearchModel.columns)
+
+    def on_get_column_type(self, n):
+        return SearchModel.columns[n][1]
+
+    def on_get_iter(self, path):
+        if path[0] >= self.__max_items:
+            raise ValueError("Invalid Path")
+        return path[0]
+
+    def on_get_path(self, rowref):
+        return (rowref, )
+
+    def on_get_value(self, rowref, col):
+        retval = None
+        self.__get_search_items(rowref, SearchModel.buffer_size)
+        if rowref < self.__max_items and self.__items and self.__items[rowref]:
+            key = SearchModel.columns[col][0]
+            if key in self.__items[rowref]:
+                data = self.__items[rowref][key]
+                if col == 2:
+                    date = dateutil.parser.parse(data)
+                    retval = date.strftime("%x")
+                elif col == 3:
+                    data = data[0].upper() + data[1:]
+                    period = data.find('.')
+                    if period >=0:
+                        retval = data[:period]
+                    else:
+                        retval = data
+                elif col == 5:
+                    retval = data[0]
+                else:
+                    retval = data
+            elif col == 1:
+                retval = "Unknown"
+            elif col == 2:
+                retval = datetime.date.today().strftime("%x")
+            else:
+                retval = ""
+        else:
+            retval = ""
+
+        return retval
+
+    def on_iter_next(self, rowref):
+        retval = None
+        rowref = rowref + 1
+        if rowref < self.__max_items:
+            retval = rowref
+        return retval
+
+    def on_iter_children(self, rowref):
+        retval = 0
+        if rowref:
+            retval =  None
+        return retval
+
+    def on_iter_has_child(self, rowref):
+        return False
+
+    def on_iter_n_children(self, rowref):
+        retval = 0
+        if not rowref:
+            retval = self.__max_items
+        return retval
+
+    def on_iter_nth_child(self, rowref, child):
+        retval = None
+        if not rowref and child < self.__max_items:
+            retval = child
+        return retval
+
+    def on_iter_parent(self, child):
+        return None
diff --git a/src/msd/msd_sort_order.py b/src/msd/msd_sort_order.py
new file mode 100644
index 0000000..5b94bca
--- /dev/null
+++ b/src/msd/msd_sort_order.py
@@ -0,0 +1,38 @@
+# media-service-demo
+#
+# Copyright (C) 2012 Intel Corporation. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU Lesser General Public License,
+# version 2.1, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Mark Ryan <mark.d.ryan@intel.com>
+#
+
+class SortOrder(object):
+
+    def __init__(self):
+        self.sort_by = "DisplayName"
+        self.ascending = False
+
+    def set_sort_by(self, sort_by):
+        if sort_by == self.sort_by:
+            self.ascending = not self.ascending
+        else:
+            self.sort_by = sort_by
+
+    def get_upnp_sort_order(self):
+        if self.ascending:
+            retval = "+"
+        else:
+            retval = "-"
+        return retval + self.sort_by
diff --git a/src/msd/msd_upnp.py b/src/msd/msd_upnp.py
new file mode 100644
index 0000000..c2e83cc
--- /dev/null
+++ b/src/msd/msd_upnp.py
@@ -0,0 +1,109 @@
+# media-service-demo
+#
+# Copyright (C) 2012 Intel Corporation. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU Lesser General Public License,
+# version 2.1, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Mark Ryan <mark.d.ryan@intel.com>
+#
+
+from msd_utils import *
+import dbus
+import os
+
+class MediaObject(object):
+
+    def __init__(self, path):
+        bus = dbus.SessionBus()
+        self.__propsIF = dbus.Interface(bus.get_object(
+                'com.intel.media-service-upnp', path),
+                                        'org.freedesktop.DBus.Properties')
+    def get_prop(self, prop_name, iface = ""):
+        return self.__propsIF.Get(iface, prop_name)
+
+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')
+
+    def search(self, query, offset, count, fltr, sort=""):
+        return self.__containerIF.SearchObjectsEx(query, offset, count, fltr,
+                                                  sort)
+
+    def list_children(self, offset, count, fltr, sort=""):
+        return self.__containerIF.ListChildrenEx(offset, count, fltr, sort)
+
+class State(object):
+
+    @staticmethod
+    def __create_server_tuple(path):
+        server = MediaObject(path)
+        folderName = server.get_prop("FriendlyName");
+
+        try:
+            icon_url = server.get_prop("IconURL");
+            image = image_from_file(icon_url)
+        except Exception:
+            image = None
+
+        return (folderName, image)
+
+    def __init_servers(self):
+        for i in self.__manager.GetServers():
+            try:
+                self.__servers[i] = State.__create_server_tuple(i)
+            except dbus.exceptions.DBusException:
+                pass
+
+    def found_server(self, path):
+        if not path in self.__servers:
+            try:
+                self.__servers[path] = State.__create_server_tuple(path)
+                if self.__found_server_cb:
+                    self.__found_server_cb(path)
+            finally:
+                pass
+
+    def lost_server(self, path):
+        if path in self.__servers:
+            del self.__servers[path]
+            if self.__lost_server_cb:
+                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')
+        self.__servers = {}
+        self.__found_server_cb = None
+        self.__lost_server_cb = None
+
+        self.__manager.connect_to_signal("FoundServer", self.found_server)
+        self.__manager.connect_to_signal("LostServer", self.lost_server)
+        self.__init_servers()
+
+    def set_lost_server_cb(self, callback):
+        self.__lost_server_cb = callback
+
+    def set_found_server_cb(self, callback):
+        self.__found_server_cb = callback
+
+    def get_server_list(self):
+        return self.__servers
diff --git a/src/msd/msd_utils.py b/src/msd/msd_utils.py
new file mode 100644
index 0000000..4a9b703
--- /dev/null
+++ b/src/msd/msd_utils.py
@@ -0,0 +1,41 @@
+# media-service-demo
+#
+# Copyright (C) 2012 Intel Corporation. All rights reserved.
+#
+# This program is free software; you can redistribute it and/or modify it
+# under the terms and conditions of the GNU Lesser General Public License,
+# version 2.1, as published by the Free Software Foundation.
+#
+# This program is distributed in the hope it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+# FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+# for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with this program; if not, write to the Free Software Foundation, Inc.,
+# 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+#
+# Mark Ryan <mark.d.ryan@intel.com>
+#
+
+import tempfile
+import pygtk
+pygtk.require('2.0')
+import gtk
+import urllib2
+import os
+
+def image_from_file(url):
+    tmpfile = tempfile.NamedTemporaryFile(delete=False)
+    tmpFileName = tmpfile.name
+    image = None
+    try:
+        with tmpfile:
+            message = urllib2.urlopen(url, None, 1)
+            tmpfile.write(message.read())
+        image = gtk.Image()
+        image.set_from_file(tmpfile.name)
+    finally:
+        os.unlink(tmpFileName)
+
+    return image