Merge lp:~joni-noplu/elisa/teletext_fix into lp:elisa

[Jonathan Rauprich]

This fixes Bug #415031
To test it, u can download the attached file in the bug report. Instead of showing a popup to the user when a stream with teletext is played, only a debug message will be shown.

[Olivier Tilloy (osomon)]

Thanks for the patch!
I tested it and it behaves as expected.
I have a couple of minor cosmetic remarks on the patch itself, if you don't object I'll apply the following tweaks and merge:

- Typo: s/Gestreamer/GStreamer/
- Typo: s/poping/popping/
- I'd like the comment to include a link to the bug report (bug #415031)
- The debug string contains extra spaces between "for" and "teletext"

review: Approve

[Jonathan Rauprich (joni-noplu)]

Thanks for reviewing, feel free to do so.

On Mon, 2010-05-31 at 15:47 +0000, Olivier Tilloy wrote:
> Review: Approve
> Thanks for the patch!
> I tested it and it behaves as expected.
> I have a couple of minor cosmetic remarks on the patch itself, if you don't object I'll apply the following tweaks and merge:
>
> - Typo: s/Gestreamer/GStreamer/
> - Typo: s/poping/popping/
> - I'd like the comment to include a link to the bug report (bug #415031)
> - The debug string contains extra spaces between "for" and "teletext"
>

[Michał Sawicz (saviq)]

Looks good enough. I would vote for adding a ignored_streams list to the config file, what do you think? You could simply add a list that contains the 'private/teletext' mimetype in its defaults and read it here.

[Paul van Tilburg (paulvt)]

Typo: s/telext/teletext/

[Olivier Tilloy (osomon)]

I have already tweaked accordingly and merged Jonathan's branch.

@Michał: yes, I though of that too, but it looked overkill until we have more than one mime type we want to filter out. At that point we'll need to implement your idea or something similar.

@Paul: I had missed this one in my review, but I fixed it before pushing. All good!

=== 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-31 15:11:38 +0000
@@ -654,7 +654,16 @@
             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 (in gstreamer) and its 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.debug('Videostream with telext found, no decoder for \
+                    teletext, dumping it!')
+            else:
+                self.emit('player-missing-decoder', mimetype, decoder)              
         elif message.structure.get_name() == 'redirect':
             new_location = message.structure['new-location']
             if '://' not in new_location: