xyz toggle camera/projector, single frame proxy fix, neophyte size fix, shortcuts...

[goodguy/history.git] / cinelerra-5.1 / cinelerra / awindowgui.C

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 1ab6ea1affe3b65c6a63ad6a95a9ba8592a0cdd3..e3271ccdbd456c8a65b8ecc8d4ac0f46457fb628 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -1699,8 +1699,12 @@ EDL *AWindowGUI::collect_proxy(Indexable *indexable)
        proxy_edl->session->audio_tracks = unproxy_asset->channels;
        proxy_edl->create_default_tracks();
        double length = proxy_asset->frame_rate > 0 ?
-               (double)proxy_asset->video_length / proxy_asset->frame_rate :
-               1.0 / mwindow->edl->session->frame_rate;
+               ( proxy_asset->video_length >= 0 ?
+                       ( proxy_asset->video_length / proxy_asset->frame_rate ) :
+                       ( proxy_edl->session->si_useduration ?
+                               proxy_edl->session->si_duration :
+                               1.0 / proxy_asset->frame_rate ) ) :
+               1.0 / proxy_edl->session->frame_rate;
        Track *current = proxy_edl->tracks->first;
        for( int vtrack=0; current; current=NEXT ) {
                if( current->data_type != TRACK_VIDEO ) continue;