← Back to branch summary

~ffdiaporamateam/ffdiaporama/trunk

« back to all changes in this revision

Viewing changes to src/ffDiaporama/engine/_Diaporama.cpp

  • Committer: domledom
  • Date: 2014-07-01 08:56:27 UTC
  • Revision ID: svn-v4:140e8a4b-7f1f-4412-90eb-051ef754ef69:trunk/ffDiaporama:488
Fixed a bug on sounds when there is more than one video on a slide
Fixed a bug on exporting soundtracks (generated export file without sound)
Fixed interactive areas editing in edit slides and edit image dialogs to make the blocks movement and blocks resizing fluid (removing redundant display)
Fixed a bug in calculating the duration of slides when adjust duration on sound

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/ffDiaporama/engine/_Diaporama.cpp
1171
1171
                    if (BackgroundBrush->BrushType==BRUSHTYPE_NOBRUSH) Painter->setBrush(Qt::NoBrush); else {
1172
1172
 
1173
1173
                        // Create brush with filter and Ken Burns effect !
1174
 
                        QBrush *BR=BackgroundBrush->GetBrush(QRectF(0,0,W,H),PreviewMode,Position,SoundTrackMontage,ImagePctDone,PrevCompoObject?PrevCompoObject->BackgroundBrush:NULL);
 
1174
                        QBrush *BR=BackgroundBrush->GetBrush(QRectF(0,0,W,H),PreviewMode,Position,BackgroundBrush->SoundVolume!=0?SoundTrackMontage:NULL,ImagePctDone,PrevCompoObject?PrevCompoObject->BackgroundBrush:NULL);
1175
1175
                        if (BR) {
1176
1176
                            QTransform  MatrixBR;
1177
1177
                            // Avoid phantom lines for image brush
2367
2367
 
2368
2368
        int64_t TrackDuration =CurMusic?QTime(0,0,0,0).msecsTo(CurMusic->GetDuration()):0;
2369
2369
        int64_t DurationLeft  =TrackDuration>CurObject->CachedStartPosition?TrackDuration-CurObject->CachedStartPosition:0;
2370
 
        int64_t NextTransition=NextObject?NextObject->GetTransitDuration():0;
 
2370
        //int64_t NextTransition=NextObject?NextObject->GetTransitDuration():0;
 
2371
        int64_t NextTransition=PrevObject?CurObject->GetTransitDuration():0;
2371
2372
        int64_t TimePlayed    =CurObject->MusicPause?((!PrevObject)||(!PrevObject->MusicPause)?CurObject->CachedTransitDuration:0):DurationLeft>CurObject->CachedDuration-NextTransition?CurObject->CachedDuration-NextTransition:DurationLeft;
2372
2373
 
2373
2374
        CurObject->CachedMusicTimePlayed=TimePlayed;