← Back to branch summary

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

« back to all changes in this revision

Viewing changes to avidemux/ADM_ogm/ADM_ogm.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_ogm/ADM_ogm.cpp
359
359
                        _isaudiopresent=1;
360
360
                        if(_audioTracks[1].audioTrack!=0xff
361
361
                                &&_audioTracks[1].nbAudioPacket 
362
 
                                && GUI_Question("Take second track ?"))
 
362
                                                && GUI_Question(_("Take second track ?")))
363
363
                        {
364
364
                                _currentAudioTrack=1;
365
365
                                _audio=new oggAudio( name, &_audioTracks[0],1 );
379
379
                return 1;
380
380
 
381
381
}
382
 
uint8_t   oggHeader::getAudioStreamsInfo(uint32_t *nbStreams, uint32_t **infos)
 
382
uint8_t   oggHeader::getAudioStreamsInfo(uint32_t *nbStreams, audioInfo **infos)
383
383
{
384
384
uint32_t nb=0;
385
385
        if(_audioTracks[0].audioTrack!=0xff) nb++;
388
388
        *infos=NULL;
389
389
        if(nb)
390
390
        {
391
 
                *infos=new uint32_t[nb];
392
 
                for(int i=0;i<nb;i++) (*infos)[i]=_audioTracks[i].encoding;
 
391
                audioInfo *ifo=new audioInfo[nb];
 
392
                *infos=ifo;
 
393
                for(int i=0;i<nb;i++)
 
394
                {
 
395
//                    WAV2AudioInfo(&(_audioTracks[i]),infos[i]);
 
396
                    ifo[i].encoding=_audioTracks[i].encoding;
 
397
                    ifo[i].channels=_audioTracks[i].channels;
 
398
                    ifo[i].bitrate=(_audioTracks[i].byterate*8)/1000;
 
399
                    ifo[i].frequency=_audioTracks[i].frequency;
 
400
                    ifo[i].av_sync=0;
 
401
                }
 
402
                    //(*infos)[i]=_audioTracks[i].encoding;
393
403
        }
394
404
        return 1;
395
405
}
429
439
 
430
440
OgAudioTrack *track1,*track2;
431
441
 
432
 
DIA_working *work=new DIA_working("Scanning OGM");
 
442
DIA_working *work=new DIA_working(_("Scanning OGM"));
433
443
 
434
444
        track1=&_audioTracks[0];
435
445
        track2=&_audioTracks[1];