~ubuntu-branches/ubuntu/wily/asunder/wily

« back to all changes in this revision

Viewing changes to src/wrappers.c

  • Committer: Bazaar Package Importer
  • Author(s): Jens Peter Secher
  • Date: 2011-02-01 20:46:03 UTC
  • mto: This revision was merged to the branch mainline in revision 8.
  • Revision ID: james.westby@ubuntu.com-20110201204603-ucmfdf4gq39ql2p3
Tags: upstream-2.1
ImportĀ upstreamĀ versionĀ 2.1

Show diffs side-by-side

added added

removed removed

Lines of Context:
97
97
    int status;
98
98
    pid_t pid;
99
99
    
 
100
    if(global_prefs == NULL)
 
101
    // Cannot call debugLog at this point
 
102
        return;
 
103
    
100
104
    pid = wait(&status);
101
105
    
102
106
    debugLog("sigchld for %d (know about wav %d, mp3 %d, ogg %d, flac %d, "
310
314
    
311
315
    snprintf(trackstring, 3, "%d", tracknum);
312
316
    
313
 
    const char * args[] = { "cdparanoia", "-Y", "-Z", "-e", "-d", cdrom, trackstring, filename, NULL };
 
317
    const char * args[] = { "cdparanoia", "-e", "-d", cdrom, trackstring, filename, NULL };
314
318
    
315
319
    fd = exec_with_output(args, STDERR_FILENO, &cdparanoia_pid);
316
320
    
850
854
        if (buf[strlen(buf) - 1] != ')' && sscanf(&buf[pos], "%d%%", &percent) == 1)
851
855
        {
852
856
            *progress = (double)percent/100;
853
 
            fprintf(stderr, "line '%s' percent %.2lf\n", &buf[pos], *progress);
 
857
            //!! This was commented out, possibly because the last line is in some 
 
858
            // different format than the normal progress
 
859
            //~ fprintf(stderr, "line '%s' percent %.2lf\n", &buf[pos], *progress);
854
860
        }
855
861
    } while (size > 0);
856
862