[pitivi: 8/11] Discoverer: rename error_debug to error_detail
- From: Edward Hervey <edwardrv src gnome org>
- To: svn-commits-list gnome org
- Subject: [pitivi: 8/11] Discoverer: rename error_debug to error_detail
- Date: Thu, 7 May 2009 11:06:20 -0400 (EDT)
commit 821b8c2780e721e8f985e4296415f4a4a9ece3ca
Author: Alessandro Decina <alessandro d gmail com>
Date: Wed May 6 16:47:31 2009 +0200
Discoverer: rename error_debug to error_detail
---
pitivi/discoverer.py | 20 ++++++++++----------
tests/test_discoverer.py | 10 +++++-----
2 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/pitivi/discoverer.py b/pitivi/discoverer.py
index 5ccaa9b..147fbc2 100644
--- a/pitivi/discoverer.py
+++ b/pitivi/discoverer.py
@@ -85,7 +85,7 @@ class Discoverer(Signallable, Loggable):
self.pipeline = None
self.bus = None
self.error = None
- self.error_debug = None
+ self.error_detail = None
self.unfixed_pads = 0
self.missing_plugin_messages = []
self.dynamic_elements = []
@@ -156,13 +156,13 @@ class Discoverer(Signallable, Loggable):
if result == gst.pbutils.INSTALL_PLUGINS_STARTED_OK:
# don't emit an error yet
self.error = None
- self.error_debug = None
+ self.error_detail = None
res = True
else:
if self.error is None:
self.error = _('Missing plugins:\n%s') % \
'\n'.join(missing_plugin_descriptions)
- self.error_debug = ''
+ self.error_detail = ''
res = False
return res
@@ -180,7 +180,7 @@ class Discoverer(Signallable, Loggable):
if not self.current_streams and self.error is None:
# EOS and no decodable streams?
self.error = _('FIXME: no output streams')
- self.error_debug = _('see above')
+ self.error_detail = _('see above')
if len(self.current_streams) == 1:
stream = self.current_streams[0]
@@ -189,7 +189,7 @@ class Discoverer(Signallable, Loggable):
is_image = False
if self.error:
- self.emit('discovery-error', self.current_uri, self.error, self.error_debug)
+ self.emit('discovery-error', self.current_uri, self.error, self.error_detail)
elif self.current_duration == gst.CLOCK_TIME_NONE and not is_image:
self.emit('discovery-error', self.current_uri,
_("Could not establish the duration of the file."),
@@ -203,7 +203,7 @@ class Discoverer(Signallable, Loggable):
else:
# woot, nothing decodable
self.error = _('Can not decode file.')
- self.error_debug = _('The given file does not contain audio, video or picture streams.')
+ self.error_detail = _('The given file does not contain audio, video or picture streams.')
factory = None
if factory is not None:
@@ -231,7 +231,7 @@ class Discoverer(Signallable, Loggable):
self.timeout_id = 0
if not self.error:
self.error = _('Timeout while analyzing file.')
- self.error_debug = _('Analyzing the file took too long.')
+ self.error_detail = _('Analyzing the file took too long.')
self._finishAnalysis()
return False
@@ -261,7 +261,7 @@ class Discoverer(Signallable, Loggable):
if not source:
self.warning("This is not a media file: %s", self.current_uri)
self.error = _("No available source handler.")
- self.error_debug = _("You do not have a GStreamer source element to handle protocol '%s'") % gst.uri_get_protocol(self.current_uri)
+ self.error_detail = _("You do not have a GStreamer source element to handle protocol '%s'") % gst.uri_get_protocol(self.current_uri)
return None
@@ -345,7 +345,7 @@ class Discoverer(Signallable, Loggable):
return
self.error = _("An internal error occured while analyzing this file: %s") % gerror.message
- self.error_debug = detail
+ self.error_detail = detail
self._finishAnalysis()
@@ -355,7 +355,7 @@ class Discoverer(Signallable, Loggable):
self.warning("We don't implement redirections currently, ignoring file")
if self.error is None:
self.error = _("File contains a redirection to another clip.")
- self.error_debug = _("PiTiVi currently does not handle redirection files.")
+ self.error_detail = _("PiTiVi currently does not handle redirection files.")
self._finishAnalysis()
return
diff --git a/tests/test_discoverer.py b/tests/test_discoverer.py
index af7a265..6f7e698 100644
--- a/tests/test_discoverer.py
+++ b/tests/test_discoverer.py
@@ -130,7 +130,7 @@ class TestAnalysis(TestCase):
Check that discoverer errors out if it can't create a source element.
"""
bag = {'error': None}
- def no_media_file_cb(disc, uri, error, error_debug):
+ def no_media_file_cb(disc, uri, error, error_detail):
bag['error'] = error
self.discoverer.addUri('buh://asd')
@@ -143,7 +143,7 @@ class TestAnalysis(TestCase):
Check for errors setting the state of the pipeline to PAUSED.
"""
bag = {'error': None}
- def no_media_file_cb(disc, uri, error, error_debug):
+ def no_media_file_cb(disc, uri, error, error_detail):
bag['error'] = error
self.discoverer.addUri('file://i/cant/possibly/exist/and/if/you/'
@@ -158,7 +158,7 @@ class TestAnalysis(TestCase):
Check that a timeout is set when analyzing a file.
"""
bag = {'error': None}
- def discovery_error_cb(disc, uri, error, error_debug):
+ def discovery_error_cb(disc, uri, error, error_detail):
bag['error'] = error
self.discoverer.connect('discovery-error', discovery_error_cb)
@@ -345,7 +345,7 @@ class TestStateChange(TestCase):
self.discoverer.current_duration = 10 * gst.SECOND
self.factories = []
self.error = None
- self.error_debug = None
+ self.error_detail = None
self.discoverer.connect('discovery-error', self.discoveryErrorCb)
self.discoverer.connect('discovery-done',
@@ -362,7 +362,7 @@ class TestStateChange(TestCase):
def discoveryErrorCb(self, disc, uri, error, debug):
self.error = error
- self.error_debug = debug
+ self.error_detail = debug
def discoveryDoneCb(self, disc, factory):
self.failUnlessEqual(factory.duration, 10 * gst.SECOND)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]