Merge lp:~joni-noplu/moovida/moovida-dvb into lp:moovida

[Jonathan Rauprich]

Added plugin for gnome-dvb-daemon
Added support for deinterlacing of dvb streams and recordings
Filtered message about missing teletext decoder
Converted some exceptions into warnings

[Olivier Tilloy (osomon)]

Hi Jonathan,
Support for DVB looks like an amazing feature (I recall it being discussed extensively but resources were never allocated for implementation).
I haven't tested your code, but I have a bunch of important remarks:

1) In case you didn't know, Moovida 1.x is not supported any longer by Fluendo Embedded (see http://www.moovida.com/blog/2010/03/26/moovida-update/ and an interesting thread on the developers' mailing list: http://lists.moovida.com/pipermail/developers-list/2010-March/001804.html). Basically that means that your best bet to get your work reviewed is to count on the community. However a large part of said community is now focused on the fork (temporarily named Elisa until a better name is agreed upon: https://launchpad.net/elisa), and the ongoing efforts are focused on:
  a) Fixing the outstanding issues in the 1.0 branch to keep it usable (no new features)
  b) Brainstorming and designing for the next version

2) Your patch mixes new features (the new gdvbd plugin) and unrelated fixes, I'd advise to submit each as separate merge requests, it will ease the life of potential reviewers.

3) For the reasons detailed in 1, you probably want to submit bug fixes against lp:elisa, you'll stand a better chance to have them reviewed and merged.

4) The fix for the amp plugin is already merged in lp:elisa, see http://bazaar.launchpad.net/~elisa-developers/elisa/1.0/revision/1616

5) A fix for bug #379409 (CSS values with no units) is already pending a review, see https://code.launchpad.net/~osomon/elisa/css_property_no_unit/+merge/26369

6) There is a bug report for the issue with teletext (bug #415031). It is in general a good practice to link to existing bug reports in the merge request. Again, this will make the life of the reviewer(s) much easier.

7) Your branch is missing the setup.py script for the new gdvbd plugin. If you haven't done so yet, I encourage you to go through the good practices detailed in the developers' guide at http://www.moovida.com/documentation/developers_guide/developers_guide.html

8) The plugin shouldn't be merged in elisa/moovida's tree: it is preferable to create a standalone project in Launchpad to host its code, track its issues separately and release it in an independent manner. This project should be declared as part of the Moovida Universe meta-project (https://launchpad.net/moovida-universe).

9) The change to the LIRC plugin seems unrelated, and in any case should be carefully explained, because it touches a sensitive piece of code.

Thanks for reading patiently my remarks! Some of them might sound picky, but please know that your effort is valued, as a former core developer on the project it is very rewarding to see such cool contributions coming in. If you're interested in the fork, drop by on irc://freenode.net/#elisa, there's always someone hanging around there.

[Jonathan Rauprich (joni-noplu)]

Hi Oliver,

thanks for the reply.

1) I read that Fluendo switch to Banshee for Moovida 2.0, and searched
for a fork but didn't found it. Maybe you could announce it anywhere?

2) The fixes are unrelated agreed, but i couldn't write the plugin on
Ubuntu 10.04 with tons of exceptions in the output. Since i didn't know
u already have a fork with some bugs fixed i thought it could help.

3) true

4/5) true too, thanks for fixing it, your code for the css problem
running well here, should i make a comment about that in your merge
proposal?

6) see 8

7) I added a setup.py script, thanks for the hint.

8) Ok about that, i did only the plugin as a separate project
https://launchpad.net/elisa-gdvbd
The Problem is that using the plugin without the changes i made on the
video_player.py (teletext issue and deinterlacing support) isn't funny
(at least here in Germany where we have DVB streams interlaced and with
teletext). For the teletext issue i can publish a patch and relate it to
the bug, and for deinterlacing support i write a new bug report, is that
the correct solution?

9) Strange none else got issues with the lirc plugin (at least i found
no bug report). On my machine its not working without that change, maybe
its because i am using inputlirc
( http://www.realh.co.uk/dvbhowto/ar01s08.html ) instead of lirc, I'll
try to track the problem and write a bug report.

I'm pretty new to launchpad and bzr and i din't fully understand the way
development is working there, so thanks again for the help.

greets

joni

On Sun, 2010-05-30 at 17:13 +0000, Olivier Tilloy wrote:
> Hi Jonathan,
> Support for DVB looks like an amazing feature (I recall it being discussed extensively but resources were never allocated for implementation).
> I haven't tested your code, but I have a bunch of important remarks:
>
> 1) In case you didn't know, Moovida 1.x is not supported any longer by Fluendo Embedded (see http://www.moovida.com/blog/2010/03/26/moovida-update/ and an interesting thread on the developers' mailing list: http://lists.moovida.com/pipermail/developers-list/2010-March/001804.html). Basically that means that your best bet to get your work reviewed is to count on the community. However a large part of said community is now focused on the fork (temporarily named Elisa until a better name is agreed upon: https://launchpad.net/elisa), and the ongoing efforts are focused on:
> a) Fixing the outstanding issues in the 1.0 branch to keep it usable (no new features)
> b) Brainstorming and designing for the next version
>
> 2) Your patch mixes new features (the new gdvbd plugin) and unrelated fixes, I'd advise to submit each as separate merge requests, it will ease the life of potential reviewers.
>
> 3) For the reasons detailed in 1, you probably want to submit bug fixes against lp:elisa, you'll stand a better chance to have them reviewed and merged.
>
> 4) The fix for the amp plugin is already merged in lp:elisa, see http://bazaar.launchpad.net/~elisa-developers/elisa/1.0/revision/1616
>
> 5) A fix for bug #379409 (CSS values with no units) is already pending a review, see https://code.launchpad.net/~osomon/elisa/css_property_no_unit/+merge/26369
>
> 6)...

[Jonathan Rauprich (joni-noplu)]

Another short question: Should i delete this proposal?

On Sun, 2010-05-30 at 17:13 +0000, Olivier Tilloy wrote:
> Hi Jonathan,
> Support for DVB looks like an amazing feature (I recall it being discussed extensively but resources were never allocated for implementation).
> I haven't tested your code, but I have a bunch of important remarks:
>
> 1) In case you didn't know, Moovida 1.x is not supported any longer by Fluendo Embedded (see http://www.moovida.com/blog/2010/03/26/moovida-update/ and an interesting thread on the developers' mailing list: http://lists.moovida.com/pipermail/developers-list/2010-March/001804.html). Basically that means that your best bet to get your work reviewed is to count on the community. However a large part of said community is now focused on the fork (temporarily named Elisa until a better name is agreed upon: https://launchpad.net/elisa), and the ongoing efforts are focused on:
> a) Fixing the outstanding issues in the 1.0 branch to keep it usable (no new features)
> b) Brainstorming and designing for the next version
>
> 2) Your patch mixes new features (the new gdvbd plugin) and unrelated fixes, I'd advise to submit each as separate merge requests, it will ease the life of potential reviewers.
>
> 3) For the reasons detailed in 1, you probably want to submit bug fixes against lp:elisa, you'll stand a better chance to have them reviewed and merged.
>
> 4) The fix for the amp plugin is already merged in lp:elisa, see http://bazaar.launchpad.net/~elisa-developers/elisa/1.0/revision/1616
>
> 5) A fix for bug #379409 (CSS values with no units) is already pending a review, see https://code.launchpad.net/~osomon/elisa/css_property_no_unit/+merge/26369
>
> 6) There is a bug report for the issue with teletext (bug #415031). It is in general a good practice to link to existing bug reports in the merge request. Again, this will make the life of the reviewer(s) much easier.
>
> 7) Your branch is missing the setup.py script for the new gdvbd plugin. If you haven't done so yet, I encourage you to go through the good practices detailed in the developers' guide at http://www.moovida.com/documentation/developers_guide/developers_guide.html
>
> 8) The plugin shouldn't be merged in elisa/moovida's tree: it is preferable to create a standalone project in Launchpad to host its code, track its issues separately and release it in an independent manner. This project should be declared as part of the Moovida Universe meta-project (https://launchpad.net/moovida-universe).
>
> 9) The change to the LIRC plugin seems unrelated, and in any case should be carefully explained, because it touches a sensitive piece of code.
>
> Thanks for reading patiently my remarks! Some of them might sound picky, but please know that your effort is valued, as a former core developer on the project it is very rewarding to see such cool contributions coming in. If you're interested in the fork, drop by on irc://freenode.net/#elisa, there's always someone hanging around there.

[Olivier Tilloy (osomon)]

> 1) I read that Fluendo switch to Banshee for Moovida 2.0, and searched
> for a fork but didn't found it. Maybe you could announce it anywhere?

The reason it hasn't been announced very visibly is that we don't have anything to show off yet, merely a forked branch with a couple of patches in it.

> 4/5) true too, thanks for fixing it, your code for the css problem
> running well here, should i make a comment about that in your merge
> proposal?

Please do!

> 8) Ok about that, i did only the plugin as a separate project
> https://launchpad.net/elisa-gdvbd
> The Problem is that using the plugin without the changes i made on the
> video_player.py (teletext issue and deinterlacing support) isn't funny
> (at least here in Germany where we have DVB streams interlaced and with
> teletext). For the teletext issue i can publish a patch and relate it to
> the bug, and for deinterlacing support i write a new bug report, is that
> the correct solution?

Yes, definitely the way to go about those issues.

> 9) Strange none else got issues with the lirc plugin (at least i found
> no bug report). On my machine its not working without that change, maybe
> its because i am using inputlirc
> ( http://www.realh.co.uk/dvbhowto/ar01s08.html ) instead of lirc, I'll
> try to track the problem and write a bug report.

Cool. The LIRC plugin is a delicate beast, usually a fix for a set of configurations is likely to break for another set of configurations, which is why a change needs a solid justification, so your investigation will be welcome.

> I'm pretty new to launchpad and bzr and i din't fully understand the way
> development is working there, so thanks again for the help.

No problem! Thanks for your contributions.

> Another short question: Should i delete this proposal?

No need to do this, it can remain here for reference.

Unmerged revisions

1619. By Jonathan Rauprich on 2010-05-30

DVB plugin done now.
Support for basic deinterlacing of TV stuff in play_video.py
Doesn't show message about not finding a teletext decoder.

1618. By Jonathan Rauprich on 2010-05-24

Support for EPG program guide and recordings. Code needs to be cleaned
up, documentated, and made nicer, but features working so far.

1617. By Jonathan Rauprich <joni@bb> on 2010-05-24

Fixed bug in lirc module.
Added initial dvb support.
Added initial recording support.

1616. By Jonathan Rauprich <joni@bb> on 2010-05-23

Convertet some exceptions to warnings, since they dosn't seem to make things bad

=== modified file 'elisa-plugins/elisa/plugins/amp/protocol.py'
--- elisa-plugins/elisa/plugins/amp/protocol.py	2009-11-09 15:44:51 +0000
+++ elisa-plugins/elisa/plugins/amp/protocol.py	2010-05-30 10:34:24 +0000
@@ -106,7 +106,7 @@
         if diff < self.ping_period:
             return
 
-        dfr = self.callRemote(Ping, cookie=self._cookie)
+        dfr = self.callRemote(Ping)
         self._startTimeout()
         dfr.addCallback(self._pingCb)
         dfr.addErrback(self._pingEb)

=== added directory 'elisa-plugins/elisa/plugins/gdvbd'
=== added file 'elisa-plugins/elisa/plugins/gdvbd/__init__.py'
=== added file 'elisa-plugins/elisa/plugins/gdvbd/controller.py'
--- elisa-plugins/elisa/plugins/gdvbd/controller.py	1970-01-01 00:00:00 +0000
+++ elisa-plugins/elisa/plugins/gdvbd/controller.py	2010-05-30 10:34:24 +0000
@@ -0,0 +1,257 @@
+from elisa.core.utils import defer
+from elisa.core.utils.i18n import install_translation
+
+from elisa.core.media_uri import MediaUri
+from elisa.core.common import application
+
+from elisa.plugins.poblesec.base.preview_list import \
+    DoubleLineMenuItemPreviewListController, SimpleListController
+from elisa.plugins.poblesec.base.list import GenericListViewMode
+from elisa.plugins.poblesec.actions import OpenControllerActionWithItem, \
+    ContextualAction
+from elisa.plugins.database.actions import PlayVideoAction
+    
+from elisa.plugins.poblesec.link import Link
+
+from datetime import datetime
+
+_ = install_translation('gdvbd')
+_p = install_translation('poblesec')
+
+def timestamp_to_day_time(timestamp):
+    d = datetime.fromtimestamp(timestamp)
+    return d.strftime('%a %H:%M')
+
+def channels_decorator(controller):
+    link = Link()
+    link.controller_path = '/gdvbd/devicegroups'
+    link.label = _('TV Stations')
+    controller.model.append(link)
+    return defer.succeed(None)
+    
+def recordings_decorator(controller):
+    link = Link()
+    link.controller_path = '/gdvbd/recordings'
+    link.label = _('Recordings')
+    controller.model.append(link)
+    return defer.succeed(None)    
+   
+class OpenControllerActionWithItemAndName(OpenControllerActionWithItem):
+    def __init__(self, controller, path):
+        return super(OpenControllerActionWithItemAndName, self).__init__(\
+            controller, path)
+        
+    def execute(self, item):
+        self._kwargs['item'] = item 
+        return self.open_controller(self.path, item.name, **self._kwargs)     
+           
+class DeviceGroupViewMode(GenericListViewMode):
+    """
+    Implementation of the common view modes API.
+    """
+    def get_label(self, item):
+        return defer.succeed(item.name)
+
+    def get_sublabel(self, item):
+        return defer.succeed("")
+
+    def get_default_image(self, item):
+        return 'elisa.plugins.poblesec.glyphs.small.video'
+
+    def get_image(self, item, theme):
+        return None
+
+    def get_preview_image(self, item, theme):
+        return None   
+        
+class ScheduleViewMode(GenericListViewMode):
+    """
+    Implementation of the common view modes API.
+    """
+    def get_label(self, item):
+        return defer.succeed("%s: %s" % (timestamp_to_day_time(\
+            item.start_timestamp), item.name))
+
+    def get_sublabel(self, item):
+        return defer.succeed(item.short_description)
+
+    def get_default_image(self, item):
+        return 'elisa.plugins.poblesec.glyphs.small.video'
+
+    def get_image(self, item, theme):
+        return None
+
+    def get_preview_image(self, item, theme):
+        return None          
+            
+class ChannelViewMode(GenericListViewMode):
+    """
+    Implementation of the common view modes API.
+    """
+    def get_label(self, item):
+        if len(item.network) > 0:
+            return defer.succeed("%s (%s)" % (item.name, item.network))
+        else:
+            return defer.succeed("%s" % item.name)
+
+    def get_sublabel(self, item):
+        if len(item.now_playing_name) > 0:
+            return defer.succeed("%s %s" % (timestamp_to_day_time(
+                item.now_playing_start_timestamp), item.now_playing_name))
+        else:
+            return defer.succeed("")
+        
+
+    def get_default_image(self, item):
+        if item.is_radio_channel:
+            return 'elisa.plugins.poblesec.glyphs.small.music'
+        return 'elisa.plugins.poblesec.glyphs.small.video'
+
+    def get_image(self, item, theme):
+        return None
+
+    def get_preview_image(self, item, theme):
+        return None    
+        
+class RecordingViewMode(GenericListViewMode):
+    """
+    Implementation of the common view modes API.
+    """
+    def get_label(self, item):
+        return defer.succeed(item.name)
+
+    def get_sublabel(self, item):
+        return defer.succeed("%s %s %d min" % (item.channel_name, \
+            timestamp_to_day_time(item.start_timestamp), item.length/60))
+
+    def get_default_image(self, item):
+        return 'elisa.plugins.poblesec.glyphs.small.video'
+
+    def get_image(self, item, theme):
+        return None
+
+    def get_preview_image(self, item, theme):
+        return None          
+        
+class RecordScheduleAction(ContextualAction):
+    name = "more"  
+    
+    def execute(self, item):
+        def _close():
+            main_controller.hide_popup()
+
+        def _record():
+            muri = MediaUri("gdvbd://device-group/%d/channel/%d/schedule/%d" % \
+                (self.controller.dg_id, self.controller.ch_id, item.id))
+            application.resource_manager.post(muri)
+            main_controller.hide_popup()
+  
+        frontend = self.controller.frontend
+        main_controller = frontend.controller
+        caption = _('Record %s' % item.name )
+        title = caption
+
+        text = _('%s Duration: %d min.' % (item.extended_description, \
+            item.duration/60))
+        buttons = [
+            (_('Record this'), _record),
+            (_('Close'), _close)
+        ]
+        return defer.succeed(main_controller.enqueue_popup(caption, \
+            title, text, buttons))
+            
+class DeleteRecordingAction(ContextualAction):
+    name = "remove"  
+    
+    def execute(self, item):
+        def _close():
+            main_controller.hide_popup()
+
+        def _delete():
+            muri = MediaUri("gdvbd://recording/%d" % item.id)
+            application.resource_manager.delete(muri)
+            self.controller.model.remove(item)
+            main_controller.hide_popup()
+  
+        frontend = self.controller.frontend
+        main_controller = frontend.controller
+        caption = _('%s' % item.name )
+        title = caption
+
+        text = _('You sure u want to delete this recording?')
+        buttons = [
+            (_('Delete it'), _delete),
+            (_('Close'), _close)
+        ]
+        return defer.succeed(main_controller.enqueue_popup(caption, \
+            title, text, buttons))            
+    
+class DeviceGroupController(DoubleLineMenuItemPreviewListController):
+    view_mode = DeviceGroupViewMode
+    empty_label = _('No registered device groups found.')
+    item_widget_kwargs = {'with_artwork_box': False}
+    
+    def populate_model(self):
+        muri = MediaUri("gdvbd://device-group/list")
+        model, dfr = application.resource_manager.get(muri)
+        return dfr
+        
+    def create_actions(self):
+        to_channels = OpenControllerActionWithItemAndName(self, \
+            '/gdvbd/channels')
+        return (to_channels, [])        
+        
+class ChannelsController(DoubleLineMenuItemPreviewListController):
+    view_mode = ChannelViewMode
+    empty_label = _('No Stations found.')
+    
+    def initialize(self, item):
+        self.dg_id = item.id
+        return super(ChannelsController, self).initialize()
+    
+    def populate_model(self):
+        muri = MediaUri("gdvbd://device-group/%d/channel/list" % self.dg_id)
+        model, dfr = application.resource_manager.get(muri)
+        return dfr
+        
+    def create_actions(self):
+        play_tv = PlayVideoAction(self)
+        show_epg = OpenControllerActionWithItemAndName(self, '/gdvbd/schedule')
+        show_epg.name = "list"
+        return (play_tv, [show_epg])         
+        
+class ScheduleController(DoubleLineMenuItemPreviewListController):
+    view_mode = ScheduleViewMode
+    empty_label = _("There is currently no schedule available for this channel")
+    
+    def initialize(self, item):
+        self.ch_id = item.id
+        self.dg_id = item.device_group.id
+        return super(ScheduleController, self).initialize()        
+
+    def populate_model(self):
+        muri = MediaUri("gdvbd://device-group/%d/channel/%d/schedule/list" % \
+            (self.dg_id, self.ch_id))
+        model, dfr = application.resource_manager.get(muri)
+        return dfr
+        
+    def create_actions(self):
+        record_item = RecordScheduleAction(self)
+        return (record_item, [])
+        
+class RecordingController(DoubleLineMenuItemPreviewListController):
+    view_mode = RecordingViewMode
+    item_widget_kwargs = {'with_artwork_box': False}
+        
+    empty_label = _("There is currently no recording available")
+
+    def populate_model(self):
+        muri = MediaUri("gdvbd://recording/list")
+        model, dfr = application.resource_manager.get(muri)
+        return dfr
+        
+    def create_actions(self):
+        play_recording = PlayVideoAction(self)
+        delete_recording = DeleteRecordingAction(self)
+        return (play_recording, [delete_recording])          
+        

=== added directory 'elisa-plugins/elisa/plugins/gdvbd/i18n'
=== added file 'elisa-plugins/elisa/plugins/gdvbd/i18n/__init__.py'
=== added directory 'elisa-plugins/elisa/plugins/gdvbd/icons'
=== added file 'elisa-plugins/elisa/plugins/gdvbd/icons/icon1.png'
Binary files elisa-plugins/elisa/plugins/gdvbd/icons/icon1.png	1970-01-01 00:00:00 +0000 and elisa-plugins/elisa/plugins/gdvbd/icons/icon1.png	2010-05-30 10:34:24 +0000 differ
=== added file 'elisa-plugins/elisa/plugins/gdvbd/icons/icon2.png'
Binary files elisa-plugins/elisa/plugins/gdvbd/icons/icon2.png	1970-01-01 00:00:00 +0000 and elisa-plugins/elisa/plugins/gdvbd/icons/icon2.png	2010-05-30 10:34:24 +0000 differ
=== added file 'elisa-plugins/elisa/plugins/gdvbd/models.py'
--- elisa-plugins/elisa/plugins/gdvbd/models.py	1970-01-01 00:00:00 +0000
+++ elisa-plugins/elisa/plugins/gdvbd/models.py	2010-05-30 10:34:24 +0000
@@ -0,0 +1,85 @@
+# -*- coding: utf-8 -*-
+#
+# This file is licensed under the GPL version 3.
+# See "LICENSE.GPL" in the root of this distribution including a special
+# exception to use Moovida with Fluendo's plugins.
+#
+# Author: Jonathan Rauprich <[e-mail]>
+
+from elisa.core.utils import defer
+from elisa.core.components.model import Model
+from elisa.plugins.base.models.media import PlayableModel
+from elisa.core.media_uri import MediaUri
+
+class DeviceGroupModel(Model):
+    def __init__(self):
+        """
+            Constructor. Initialize all the fields.
+        """
+        super(DeviceGroupModel, self).__init__()
+        self.id = None
+        self.name = None  
+        self.client = None
+        self.recorder = None
+        self.channel_list = None
+
+class ChannelModel(Model):
+    def __init__(self):
+        """
+            Constructor. Initialize all the fields.
+        """
+        super(ChannelModel, self).__init__()
+        self.id = None
+        self.name = None   
+        self.network = None
+        self.is_radio_channel = None
+        self.url = None
+        self.device_group = None
+        self.now_playing_name = None
+        self.now_playing_start_timestamp = None
+
+    def get_playable_model(self):
+        playable_model = PlayableModel()
+        playable_model.title = self.name
+        playable_model.uri = MediaUri(self.url)
+        playable_model.do_deinterlace = True
+        return defer.succeed(playable_model)        
+        
+
+class ScheduleModel(Model):
+    def __init__(self):
+        """
+            Constructor. Initialize all the fields.
+        """
+        super(ScheduleModel, self).__init__()
+        self.id = None
+        self.name = None   
+        self.short_description = None
+        self.extended_description = None
+        self.duration = None
+        self.start_time = None
+        self.start_timestamp = None
+        self.is_running = None
+        self.is_scrambled = None
+
+class RecordingModel(Model):
+    def __init__(self):
+        """
+            Constructor. Initialize all the fields.
+        """
+        super(RecordingModel, self).__init__()
+        self.id = None
+        self.name = None           
+        self.location = None
+        self.description = None
+        self.length = None
+        self.start_time = None
+        self.start_timestamp = None
+        self.channel_name = None
+        
+    def get_playable_model(self):
+        playable_model = PlayableModel()
+        playable_model.title = self.name
+        playable_model.uri = MediaUri("file://%s" % self.location)
+        playable_model.do_deinterlace = True        
+        return defer.succeed(playable_model)             

=== added file 'elisa-plugins/elisa/plugins/gdvbd/resource_provider.py'
--- elisa-plugins/elisa/plugins/gdvbd/resource_provider.py	1970-01-01 00:00:00 +0000
+++ elisa-plugins/elisa/plugins/gdvbd/resource_provider.py	2010-05-30 10:34:24 +0000
@@ -0,0 +1,264 @@
+# -*- coding: utf-8 -*-
+#
+# This file is licensed under the GPL version 3.
+# See "LICENSE.GPL" in the root of this distribution including a special
+# exception to use Moovida with Fluendo's plugins.
+#
+# Author: Jonathan Rauprich <[e-mail]>
+
+"""
+Provide access to resources served by gnome-dvb-daemon over DBUS.
+"""
+
+from elisa.core.components.resource_provider import ResourceProvider, \
+    ResourceNotFound
+from elisa.plugins.gdvbd.models import DeviceGroupModel, ChannelModel, \
+    ScheduleModel, RecordingModel
+from elisa.core.utils import defer
+
+from gnomedvb import DVBManagerClient, DVBRecordingsStoreClient
+import re
+
+
+
+class GdvbdResourceProvider(ResourceProvider):
+    """
+        Implements REST access to gnome-dvb-daemon, with simple urls.
+        
+        The interresting part of the gnome-dvb-daemon is like the following:
+        
+        gdvbd
+        |-> Device Groups
+        |   |-> Device Group 1
+        |   |   |-> Channel List
+        |   |   |   |-> Channel 1
+        |   |   |   |   |-> schedule
+        |   |   |   |-> Channel 2
+        |   |   |   |   |-> ...
+        |   |-> Device Group 2
+        |   |   |-> ....
+        |-> Recordings
+        |   |-> Recording 1
+        |   |-> Recording 2
+        |   |-> ....
+        
+        This REST implementation allows u the following actions
+        
+        GET gdvbd://device-group/list
+            Return list of device groups
+        GET gdvbd://device-group/<GROUP_ID>/channel/list
+            Return list of channels for device group
+        GET gdvbd://device-group/<GROUP_ID>/channel/<CHANNEL_ID>/schedule/list
+            Return list of schedules for channel
+        GET gdvbd://recording/list
+            Returns a list of recordings
+
+        POST gdvbd://device-group/<GROUP_ID>/channel/<CHANNEL_ID>/schedule/<schedule_ID>
+            Recording the schedule on the channel
+            
+        DELETE gdvbd://recording/<RECORDING_ID>
+            Delete the recording
+    """
+        
+    base_uri = "gdvbd://"
+    dev_groups = "%sdevice-group/list" % base_uri
+    dev_groups_re = re.compile(dev_groups)
+    channel_list = "%sdevice-group/(\d*)/channel/list" % base_uri
+    channel_list_re = re.compile(channel_list)
+    schedule_list = "%sdevice-group/(\d*)/channel/(\d*)/schedule/list" % base_uri
+    schedule_list_re = re.compile(schedule_list)
+    recording_list = "%srecording/list" % base_uri
+    recording_list_re = re.compile(recording_list)
+    create_recording = "%sdevice-group/(\d*)/channel/(\d*)/schedule/(\d*)" \
+        % base_uri
+    create_recording_re = re.compile(create_recording)
+    delete_recording = "%srecording/(\d*)" % base_uri
+    delete_recording_re = re.compile(delete_recording)
+    
+    supported_uri = dev_groups + "|" + channel_list + "|" + schedule_list + "|" \
+        + recording_list + "|" + create_recording + "|" + delete_recording
+    
+    RELOAD_TIME = 300.0
+    
+    def initialize(self):
+        """
+            Init the data stucture and register callbacks, but since this is
+            taking a time, do it threaded.
+        """
+        dfr = super(GdvbdResourceProvider, self).initialize()
+        # get a manager
+        self.manager = DVBManagerClient()
+        self.recorder = DVBRecordingsStoreClient()        
+        # load device groups, also do that if they change
+        self._init_dgs()
+        self.manager.connect("group-added", self._init_dgs)
+        self.manager.connect("group-removed", self._init_dgs)        
+        self._init_recordings()
+        self.recorder.connect("changed", self._init_recordings)
+        return dfr 
+            
+    def _init_dgs(self, *args):
+        self.device_groups = []
+        for device_group in self.manager.get_registered_device_groups():
+            dgmodel = self._create_dg_model(device_group)
+            self.device_groups.append(dgmodel)
+
+    def _init_recordings(self, *args):
+        self.recordings = []
+        for rid in self.recorder.get_recordings():
+            #informations -> 0 -> rid # 1 -> title # 2 -> description
+            # 3 -> length # 4 -> start_timestamp # 5 -> channel_name
+            # 6 -> location
+            (informations, success) = self.recorder.get_all_informations(rid)
+            if success:
+                rmodel = RecordingModel()
+                rmodel.id = rid
+                rmodel.name = informations[1]
+                rmodel.description = informations[2]                
+                rmodel.length = informations[3]                                
+                rmodel.start_timestamp = informations[4]                                
+                rmodel.channel_name = informations[5]
+                rmodel.location = informations[6]
+                (start_time, success) = self.recorder.get_start_time(rid)
+                if success:
+                    rmodel.start_time = start_time
+                self.recordings.append(rmodel)   
+                                       
+
+    def _create_dg_model(self, device_group):
+        dgmodel = DeviceGroupModel()
+        dgmodel.id = device_group.get_id()
+        dgmodel.name = device_group.get_name()
+        dgmodel.client = device_group
+        dgmodel.recorder = device_group.get_recorder()
+        dgmodel.channels = []
+        dgmodel.channel_list = device_group.get_channel_list()
+        return dgmodel
+        
+    def _create_chan_model(self, cid, cl):
+        cm = ChannelModel()
+        cm.id = cid
+        (name, success) = cl.get_channel_name(cid)
+        if success:
+            cm.name = name
+        (network, success) = cl.get_channel_network(cid)
+        if success:
+            cm.network = network
+        (is_radio_channel, success) = cl.is_radio_channel(cid)
+        if success:
+            cm.is_radio_channel = is_radio_channel
+        (url, success) = cl.get_channel_url(cid)
+        if success:
+            cm.url = url
+        return cm
+        
+    def _create_schedule(self, dg, cid):
+        shed = dg.client.get_schedule(cid)
+        schedule = []
+        for eid in shed.get_all_events():
+            smodel = ScheduleModel()
+            smodel.id = eid
+            (name, success) = shed.get_name(eid)
+            if success:
+                smodel.name = name
+            (short_description, success) = shed.get_short_description(eid)
+            if success:
+                smodel.short_description = short_description                
+            (extended_description, success) = shed.get_extended_description(eid)
+            if success:
+                smodel.extended_description = extended_description                
+            (duration, success) = shed.get_duration(eid)
+            if success:
+                smodel.duration = duration               
+            (start_time, success) = shed.get_local_start_time(eid)
+            if success:
+                smodel.start_time = start_time                
+            (start_timestamp, success) = shed.get_local_start_timestamp(eid)
+            if success:
+                smodel.start_timestamp = start_timestamp        
+            (is_running, success) = shed.is_running(eid)
+            if success:
+                smodel.is_running = is_running                
+            (is_scrambled, success) = shed.is_scrambled(eid)
+            if success:
+                smodel.is_scrambled = is_scrambled     
+            schedule.append(smodel)
+        return schedule                                             
+            
+    def _get_dg_for_dgid(self, dgid):
+        for dg in self.device_groups:
+            if dg.id == dgid:
+                return dg
+        return None  
+                
+                
+    def get(self, uri, context_model=None):
+        url = str(uri)
+
+        m = self.dev_groups_re.match(url)
+        if m:
+            self._init_dgs()
+            return (self.device_groups, defer.succeed(self.device_groups))
+            
+        m = self.channel_list_re.match(url)
+        if m:
+            dg = self._get_dg_for_dgid(int(m.group(1)))
+            if dg:
+                channels = []
+                for cid in dg.client.get_channel_list().get_channels():
+                    chmodel = self._create_chan_model(cid, dg.channel_list)
+                    chmodel.device_group = dg
+                    # Look whats on now
+                    shed = dg.client.get_schedule(chmodel.id)
+                    now = shed.now_playing()            
+                    (chmodel.now_playing_name, success) = shed.get_name(now)                    
+                    (chmodel.now_playing_start_timestamp, success) = shed.\
+                        get_local_start_timestamp(now)                
+                    channels.append(chmodel)
+                return (channels, defer.succeed(channels))  
+            return (None, defer.fail(ResourceNotFound()))
+            
+        m = self.schedule_list_re.match(url)            
+        if m:
+
+            dg = self._get_dg_for_dgid(int(m.group(1)))
+            if dg:
+                schedule = self._create_schedule(dg, int(m.group(2)))
+                return (schedule, defer.succeed(schedule))
+            return (None, defer.fail(ResourceNotFound()))
+        
+        m = self.recording_list_re.match(url)
+        if m:
+            return (self.recordings, defer.succeed(self.recordings))
+            
+        return (None, defer.fail(ResourceNotFound()))            
+        
+    def delete(self, uri):
+        url = str(uri)
+        m = self.delete_recording_re.match(url)
+        if m:
+            if self.recorder.delete(int(m.group(1))) == 1:
+                return defer.succeed(None)   
+        return defer.fail(ResourceNotFound())
+
+    def post(self, uri, **parameters):
+        url = str(uri)
+        m = self.create_recording_re.match(url)
+        if m:
+            dg = self._get_dg_for_dgid(int(m.group(1)))
+            (rec_id, success) = dg.recorder.add_timer_for_epg_event(
+                int(m.group(3)), int(m.group(2)))
+            if success:
+                return defer.succeed(None)
+        return defer.fail(ResourceNotFound())            
+        
+            
+        
+            
+                        
+            
+            
+                    
+        
+        
+        

=== modified file 'elisa-plugins/elisa/plugins/lirc/lirc_input.py'
--- elisa-plugins/elisa/plugins/lirc/lirc_input.py	2009-11-09 15:44:51 +0000
+++ elisa-plugins/elisa/plugins/lirc/lirc_input.py	2010-05-30 10:34:24 +0000
@@ -141,7 +141,7 @@
 
     def _got_event(self, hex_key, repeat, key_value, remote):
         now = time.time()
-        if repeat != '00':
+        if repeat != '0':
             # If the remote sends a repeat signal, ie. repeat different from 00
             elapsed_since_first_event = now - self._first_event_time
             elapsed_since_last_repeat = now - self._last_repeat_time

=== modified file 'elisa-plugins/elisa/plugins/pigment/widgets/panel.py'
--- elisa-plugins/elisa/plugins/pigment/widgets/panel.py	2009-11-17 22:55:46 +0000
+++ elisa-plugins/elisa/plugins/pigment/widgets/panel.py	2010-05-30 10:34:24 +0000
@@ -14,6 +14,8 @@
 # See "LICENSE.Moovida" in the root directory of this distribution package
 # for details on that license.
 
+from elisa.core import log
+
 from elisa.plugins.pigment.graph.node import Node
 from elisa.plugins.pigment.graph.image import Image
 from elisa.plugins.pigment.graph import keysyms
@@ -210,37 +212,45 @@
         self.bottom_right.set_position(x, y, az)
 
     def _compute_border_sizes(self):
-        fx, fy = self.get_factors_absolute(self.left_width.unit)
-        self._left_width = fx*self.left_width.value
-
-        fx, fy = self.get_factors_absolute(self.right_width.unit)
-        self._right_width = fx*self.right_width.value
-
-        fx, fy = self.get_factors_absolute(self.top_height.unit)
-        self._top_height = fy*self.top_height.value
-
-        fx, fy = self.get_factors_absolute(self.bottom_height.unit)
-        self._bottom_height = fy*self.bottom_height.value
-        self._sizes_computed = True
+        try:
+            fx, fy = self.get_factors_absolute(self.left_width.unit)
+            self._left_width = fx*self.left_width.value
+
+            fx, fy = self.get_factors_absolute(self.right_width.unit)
+            self._right_width = fx*self.right_width.value
+                      
+            fx, fy = self.get_factors_absolute(self.top_height.unit)
+            self._top_height = fy*self.top_height.value
+               
+            fx, fy = self.get_factors_absolute(self.bottom_height.unit)
+            self._bottom_height = fy*self.bottom_height.value
+                
+            self._sizes_computed = True
+            
+        except AttributeError as e:
+            log.warning('panel', e.message)
 
     def _update_size(self):
         if not self.is_mapped:
             return
         self._compute_border_sizes()
-        self.top_left.set_size(self._left_width, self._top_height)
-        self.top_right.set_size(self._right_width, self._top_height)
-        self.bottom_left.set_size(self._left_width, self._bottom_height)
-        self.bottom_right.set_size(self._right_width, self._bottom_height)
-
-        self._middle_width = self.absolute_width - self._left_width - self._right_width
-        self._middle_height = self.absolute_height - self._top_height - self._bottom_height
-
-        self.top_middle.set_size(self._middle_width, self._top_height)
-        self.middle_left.set_size(self._left_width, self._middle_height)
-        self.middle_middle.set_size(self._middle_width, self._middle_height)
-        self.middle_right.set_size(self._right_width, self._middle_height)
-        self.bottom_middle.set_size(self._middle_width, self._bottom_height)
-
+        
+        try:
+            self.top_left.set_size(self._left_width, self._top_height)
+            self.top_right.set_size(self._right_width, self._top_height)
+            self.bottom_left.set_size(self._left_width, self._bottom_height)
+            self.bottom_right.set_size(self._right_width, self._bottom_height)
+
+            self._middle_width = self.absolute_width - self._left_width - self._right_width
+            self._middle_height = self.absolute_height - self._top_height - self._bottom_height
+
+            self.top_middle.set_size(self._middle_width, self._top_height)
+            self.middle_left.set_size(self._left_width, self._middle_height)
+            self.middle_middle.set_size(self._middle_width, self._middle_height)
+            self.middle_right.set_size(self._right_width, self._middle_height)
+            self.bottom_middle.set_size(self._middle_width, self._bottom_height)
+        except AttributeError as e:
+            log.warning('panel', e.message)
 
 
     @classmethod

=== modified file 'elisa-plugins/elisa/plugins/poblesec/player_video.py'
--- elisa-plugins/elisa/plugins/poblesec/player_video.py	2010-01-28 17:18:54 +0000
+++ elisa-plugins/elisa/plugins/poblesec/player_video.py	2010-05-30 10:34:24 +0000
@@ -489,7 +489,33 @@
 
         self.pgm_sink = gst.element_factory_make('pgmimagesink')
         self.pipeline = gst.element_factory_make('playbin')
-        self.pipeline.set_property('video-sink', self.pgm_sink)
+        # Here we go now and add deinteralcing support for the pipeline
+        # This is done, by adding the following pipeline as video-sink
+        #
+        # -> ffmpegcolorspace -> deinterlace -> ffmpegcolorspace -> pgmimagesink
+        #        csc1            deinterlacde        csc2             pgm_sink
+        # 
+        # ffdeinterlace could do this without colorspaceconversion, but it can't
+        # be disabled that simple and has no further options
+        bin = gst.Bin("deinterlacebin")
+        csc = gst.element_factory_make("ffmpegcolorspace")
+        csc2 = gst.element_factory_make("ffmpegcolorspace")
+
+        self.deinterlace = gst.element_factory_make("deinterlace")
+        # Disable deinterlacing by default
+        self.deinterlace.set_property("mode", 2)
+        
+        bin.add(csc)
+        bin.add(self.deinterlace)
+        bin.add(self.pgm_sink)       
+        bin.add(csc2)
+
+        pad = csc.get_pad("sink")
+        ghostpad = gst.GhostPad("sink", pad)  
+        bin.add_pad(ghostpad)
+        
+        gst.element_link_many(csc, self.deinterlace, csc2, self.pgm_sink)
+        self.pipeline.set_property("video-sink", bin)
 
         self.status = self.STOPPED
         self.target_status = self.STOPPED
@@ -654,7 +680,12 @@
             details = caps.to_string().split(', ')
             mimetype = details[0]
             decoder = pbutils.get_decoder_description(mimetype)
-            self.emit('player-missing-decoder', mimetype, decoder)
+            # Gestreamer complains that teletext decoder is missing, but there
+            # is no teletext decoder and ints not realy a problem as long as u
+            # don't care for teletext. So this is to prevent the warning message
+            # poping up everytime a videostream with teletext is played.
+            if mimetype != "private/teletext":
+                self.emit('player-missing-decoder', mimetype, decoder)                
         elif message.structure.get_name() == 'redirect':
             new_location = message.structure['new-location']
             if '://' not in new_location:
@@ -821,6 +852,18 @@
         self.filename = model.title or model.uri.filename
         self.stop()
         uri = unicode(model.uri).encode(locale_helper.gst_file_encoding())
+        
+        # Here we enable deinterlacing if the model got a attribute
+        # do deinterlace set to True
+        try:
+            if model.do_deinterlace:
+                self.deinterlace.set_property("mode", 1)
+                self.debug("Enabling deinterlacing for this video")                
+            else:
+                self.deinterlace.set_property("mode", 2)
+        except AttributeError:
+            self.deinterlace.set_property("mode", 2)    
+            
         if uri.startswith('file://'):
             # Hack to workaround the messy handling of file paths using MediaUri
             # objects. In various places in the code, file paths are not

=== added directory 'elisa-plugins/elisa_plugin_gdvbd.egg-info'
=== added file 'elisa-plugins/elisa_plugin_gdvbd.egg-info/PKG-INFO'
--- elisa-plugins/elisa_plugin_gdvbd.egg-info/PKG-INFO	1970-01-01 00:00:00 +0000
+++ elisa-plugins/elisa_plugin_gdvbd.egg-info/PKG-INFO	2010-05-30 10:34:24 +0000
@@ -0,0 +1,10 @@
+Metadata-Version: 1.0
+Name: elisa-plugin-gdvbd
+Version: 0.1
+Summary: Gnome DVB Daemon Plugin
+Home-page: https://code.launchpad.net/~joni-noplu/moovida/moovida-dvb
+Author: Jonathan Rauprich
+Author-email: [e-mail]
+License: GPL3
+Description: Watch TV, Record Shows, View ur Recordings via gnome-dvb-daemon, now availible in moovida.
+Platform: UNKNOWN

=== added file 'elisa-plugins/elisa_plugin_gdvbd.egg-info/controller_mappings.txt'
--- elisa-plugins/elisa_plugin_gdvbd.egg-info/controller_mappings.txt	1970-01-01 00:00:00 +0000
+++ elisa-plugins/elisa_plugin_gdvbd.egg-info/controller_mappings.txt	2010-05-30 10:34:24 +0000
@@ -0,0 +1,4 @@
+/gdvbd/channels = elisa.plugins.gdvbd.controller:ChannelsController
+/gdvbd/devicegroups = elisa.plugins.gdvbd.controller:DeviceGroupController
+/gdvbd/schedule = elisa.plugins.gdvbd.controller:ScheduleController
+/gdvbd/recordings = elisa.plugins.gdvbd.controller:RecordingController

=== added file 'elisa-plugins/elisa_plugin_gdvbd.egg-info/decorator_mappings.txt'
--- elisa-plugins/elisa_plugin_gdvbd.egg-info/decorator_mappings.txt	1970-01-01 00:00:00 +0000
+++ elisa-plugins/elisa_plugin_gdvbd.egg-info/decorator_mappings.txt	2010-05-30 10:34:24 +0000
@@ -0,0 +1,3 @@
+/poblesec/tv_menu = elisa.plugins.gdvbd.controller:recordings_decorator
+/poblesec/tv_menu = elisa.plugins.gdvbd.controller:channels_decorator
+

=== added file 'elisa-plugins/elisa_plugin_gdvbd.egg-info/dependency_links.txt'
--- elisa-plugins/elisa_plugin_gdvbd.egg-info/dependency_links.txt	1970-01-01 00:00:00 +0000
+++ elisa-plugins/elisa_plugin_gdvbd.egg-info/dependency_links.txt	2010-05-30 10:34:24 +0000
@@ -0,0 +1,1 @@
+

=== added file 'elisa-plugins/elisa_plugin_gdvbd.egg-info/entry_points.txt'
--- elisa-plugins/elisa_plugin_gdvbd.egg-info/entry_points.txt	1970-01-01 00:00:00 +0000
+++ elisa-plugins/elisa_plugin_gdvbd.egg-info/entry_points.txt	2010-05-30 10:34:24 +0000
@@ -0,0 +1,3 @@
+    [elisa.core.components.resource_provider]
+    YoutubeResourceProvider = elisa.plugins.gdvbd.resource_provider:GdvbdResourceProvider
+

=== added file 'elisa-plugins/elisa_plugin_gdvbd.egg-info/namespace_packages.txt'
--- elisa-plugins/elisa_plugin_gdvbd.egg-info/namespace_packages.txt	1970-01-01 00:00:00 +0000
+++ elisa-plugins/elisa_plugin_gdvbd.egg-info/namespace_packages.txt	2010-05-30 10:34:24 +0000
@@ -0,0 +1,2 @@
+elisa
+elisa.plugins

=== added file 'elisa-plugins/elisa_plugin_gdvbd.egg-info/top_level.txt'
--- elisa-plugins/elisa_plugin_gdvbd.egg-info/top_level.txt	1970-01-01 00:00:00 +0000
+++ elisa-plugins/elisa_plugin_gdvbd.egg-info/top_level.txt	2010-05-30 10:34:24 +0000
@@ -0,0 +1,1 @@
+elisa