← Back to branch summary

~ubuntu-branches/ubuntu/gutsy/sound-juicer/gutsy

« back to all changes in this revision

Viewing changes to libjuicer/sj-extractor.c

  • Committer: Bazaar Package Importer
  • Author(s): Sebastien Bacher
  • Date: 2007-08-13 12:51:47 UTC
  • mfrom: (1.1.20 upstream)
  • Revision ID: james.westby@ubuntu.com-20070813125147-umt0fqs6bwt74az6
Tags: 2.19.3-0ubuntu1
* New upstream version:
  - When removing sources be more paranoid.  I hope this fixes the 
    many-duplicated crasher.
  - Translate the program description
  - Bump libmusicbrainz requirement
* debian/control.in:
  - updated libmusicbrainz4-dev requirement

Show diffs side-by-side

added added

removed removed

Lines of Context:
libjuicer/sj-extractor.c
163
163
  if (priv->pipeline)
164
164
    gst_element_set_state (priv->pipeline, GST_STATE_NULL);
165
165
 
166
 
  if (priv->tick_id != 0)
 
166
  if (priv->tick_id)
167
167
    g_source_remove (priv->tick_id);
168
168
 
169
169
  g_free (priv->device_path);
258
258
 
259
259
  gst_element_set_state (priv->pipeline, GST_STATE_NULL);
260
260
 
261
 
  g_source_remove (priv->tick_id);
262
 
  priv->tick_id = 0;
 
261
  if (priv->tick_id) {
 
262
    g_source_remove (priv->tick_id);
 
263
    priv->tick_id = 0;
 
264
  }
263
265
 
264
266
  /* TODO: shouldn't need to do this, see #327197 */
265
267
  priv->rebuild_pipeline = TRUE;
296
298
  gst_element_set_state (priv->pipeline, GST_STATE_NULL);
297
299
  extractor->priv->rebuild_pipeline = TRUE;
298
300
 
299
 
  g_source_remove (priv->tick_id);
300
 
  priv->tick_id = 0;
 
301
  if (priv->tick_id) {
 
302
    g_source_remove (priv->tick_id);
 
303
    priv->tick_id = 0;
 
304
  }
301
305
 
302
306
  gst_message_parse_error (message, &error, NULL);
303
307
  g_signal_emit (extractor, signals[ERROR], 0, error);