← Back to branch summary

~ubuntu-branches/ubuntu/hardy/avidemux/hardy

« back to all changes in this revision

Viewing changes to avidemux/ADM_nuv/ADM_nuv.cpp

  • Committer: Bazaar Package Importer
  • Author(s): Daniel T Chen
  • Date: 2006-12-15 17:13:20 UTC
  • mfrom: (1.1.6 upstream)
  • Revision ID: james.westby@ubuntu.com-20061215171320-w79pvpehxx2fr217
Tags: 1:2.3.0-0.0ubuntu1
* Merge from debian-multimedia.org, remaining Ubuntu change:
  - desktop file,
  - no support for ccache and make -j.
* Closes Ubuntu: #69614.

Show diffs side-by-side

added added

removed removed

Lines of Context:
avidemux/ADM_nuv/ADM_nuv.cpp
493
493
                if(fourCC::check((uint8_t *)head->finfo,(uint8_t *)"Myth"))
494
494
                {
495
495
                        _isMyth=1;
 
496
                        printf("IsMyth : yes\n");
496
497
 
497
498
                }
498
499
                Dump();
564
565
                {
565
566
                        if(work->update(  (uint32_t)( next>>8),(uint32_t)(_filesize>>8))) /* 2 Gb * 256 should be enough ... */
566
567
                        {
567
 
                                if(GUI_Question("Sure you want to abort ?"))
 
568
                              if(GUI_Question(_("Sure you want to abort ?")))
568
569
                                {
569
570
                                                // purge aqueue,vqueue & rqueue
570
571
 
775
776
                                                _mythData=new mythHeader;
776
777
                                                if(frame.packetlength!=sizeof(mythHeader))
777
778
                                                        {
778
 
                                                                GUI_Error_HIG("Size mismatch", "Expect a crash.");
 
779
                                                            GUI_Error_HIG(_("Size mismatch"), _("Expect a crash."));
779
780
 
780
781
                                                        }
781
782
                                                uint64_t old;
1067
1068
                                }
1068
1069
                                ADM_dealloc(mname);
1069
1070
                        }
1070
 
                        if(GUI_Question("Do you want to save an index ?")){
 
1071
                        if(GUI_Question(_("Do you want to save an index ?"))){
1071
1072
                                GUI_FileSelWrite("Nuv index to save..",&mname);
1072
1073
                                if(mname){
1073
1074
                                        saveIndex( mname,name);
1313
1314
        fscanf(fd,"wh: %" SCNu32 " %" SCNu32 "\n",&w,&h ); // mark it as a avidemux index
1314
1315
        fscanf(fd,"fps: %" SCNu32 "\n",&fps );
1315
1316
        fscanf(fd,"Lzo Pos:%" SCNu64 "\n",&_lzo_pos);
1316
 
        fscanf(fd,"Lzo Size:%" SCNu64 "\n",&_lzo_size);
1317
 
        fgets(str,1000,fd);
1318
 
        fscanf(fd,"Myth:%" SCNu8 "\n",&_isMyth);
1319
 
        fscanf(fd,"Xvid:%" SCNu8 "\n",&_isXvid);
1320
 
        fscanf(fd,"FFV1:%" SCNu8 "\n",&_isFFV1);
 
1317
        fscanf(fd,"Lzo Size:%" SCNu64 "\n\n",&_lzo_size);
 
1318
        
 
1319
        fscanf(fd,"Myth:%"SCNu8"\n",&_isMyth);
 
1320
        fscanf(fd,"Xvid:%"SCNu8"\n",&_isXvid);
 
1321
        fscanf(fd,"FFV1:%"SCNu8"\n",&_isFFV1);
1321
1322
        fscanf(fd,"ff4c:%x\n",&_ffv1_fourcc);   
1322
1323
        
1323
1324
        fscanf(fd,"extr:%x\n",&_ffv1_extraLen);
1472
1473
                                );
1473
1474
                                _audioIndex[j]._compression = compress;
1474
1475
                }
1475
 
                _audioTrack=new nuvAudio(_audioIndex,nbc,_fd,_audio_frequency,NULL);
 
1476
                // Build a fake audio header...
 
1477
                mythHeader hdr;
 
1478
                memset(&hdr,0,sizeof(hdr));
 
1479
                if(_isPCM) hdr.audio_fourcc=fourCC::get((uint8_t *)"RAWA");
 
1480
                  else     hdr.audio_fourcc=WAV_MP3;
 
1481
                hdr.audio_bits_per_sample=16;;
 
1482
                hdr.audio_sample_rate=_audio_frequency; 
 
1483
                hdr.audio_channels=2;;
 
1484
                //
 
1485
                _audioTrack=new nuvAudio(_audioIndex,nbc,_fd,_audio_frequency,&hdr);
1476
1486
                _isaudiopresent=1;
1477
1487
                _isvideopresent=1;
1478
1488
                _max=DXFIELD(width)*DXFIELD(height);