Changeset 332

Show
Ignore:
Timestamp:
02/06/07 14:56:08 (2 years ago)
Author:
astrange
Message:

Revert broken end-time handling in overlap handling to old (also broken) behavior. Fix warnings for Codecprintf.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved

  • trunk/Codecprintf.c

    r194 r332  
    3939#endif 
    4040         
     41        return ret; 
    4142} 
    4243 

  • trunk/Perian.xcodeproj/project.pbxproj

    r331 r332  
    18091809                                GCC_WARN_ABOUT_RETURN_TYPE = YES; 
    18101810                                GCC_WARN_TYPECHECK_CALLS_TO_PRINTF = YES; 
    1811                                 GCC_WARN_UNINITIALIZED_AUTOS = YES; 
    18121811                                HEADER_SEARCH_PATHS = ( 
    18131812                                        ffmpeg/libavcodec, 

  • trunk/SSADocument.m

    r330 r332  
    549549                 
    550550                PtrToHand(str,&sampleHndl,sampleLen); 
    551                  
     551 
    552552                err=AddMediaSample(theMedia,sampleHndl,0,sampleLen, p->end_time - p->begin_time,(SampleDescriptionHandle)textDesc, 1, 0, &sampleTime); 
    553                 if (err != noErr) goto bail; 
     553                if (err != noErr) {err = GetMoviesError(); goto bail;} 
    554554                 
    555555                ConvertTimeScale(&movieStartTime, movieTimeScale); 
    556556 
    557557                err = InsertMediaIntoTrack(theTrack, movieStartTime.value.lo, sampleTime, p->end_time - p->begin_time, fixed1); 
    558                 if (err != noErr) {goto bail;} 
     558                if (err != noErr) {err = GetMoviesError(); goto bail;} 
    559559 
    560560                DisposeHandle(sampleHndl); 
    …… 
    573573         
    574574bail: 
    575                  
     575 
    576576        [ssa release]; 
    577577        [pool release]; 

  • trunk/SSARenderCodec.m

    r331 r332  
    107107        int i, lstart, lend, lstep, subcount, j; char direction; 
    108108        float outline, shadow; 
    109         if (!(glob && glob->document)) {NSLog(@"Something wrong in SSA globals");} 
     109        if (!(glob && glob->document)) {NSLog(@"Something wrong in SSA globals"); return;} 
    110110        SSADocument *ssa = glob->document; 
    111111        NSAutoreleasePool *pool = [[NSAutoreleasePool alloc] init]; 

  • trunk/SSATagParsing.m.rl

    r331 r332  
    459459                        %%write eof; 
    460460                         
    461                         if (re->text[len-1] == '}') skipbegin = p; // make up for how exit_tag isn't called if the } is the last char in the line 
     461                        if (pb[len-1] == '}') skipbegin = p; // make up for how exit_tag isn't called if the } is the last char in the line 
    462462 
    463463                        end_re; 

  • trunk/SubImport.mm

    r331 r332  
    214214        } 
    215215 
     216        EndMediaEdits(theMedia); 
     217         
    216218        sampleHndl = NULL; 
    217219 
    …… 
    412414                if (i > 0 && times[i-1] == times[i]) continue; 
    413415                NSMutableString *accum = [NSMutableString string]; 
    414                 unsigned start = times[i], end = times[i+1]; 
     416                unsigned start = times[i], end = start; 
    415417                bool startedOutput = false, finishedOutput = false; 
    416418                 
    …… 
    421423                for (int j=0; j < num; j++) { 
    422424                        if (isinrange(times[i], slines[j]->begin_time, slines[j]->end_time)) { 
     425                                end = slines[j]->end_time; 
    423426                                [accum appendString:slines[j]->line]; 
    424427                                startedOutput = true;