add binfolder path relative filters, fix gbrp color model, vwdw timebar tweaks, title...

[goodguy/history.git] / cinelerra-5.1 / guicast / vicon.C

diff --git a/cinelerra-5.1/guicast/vicon.C b/cinelerra-5.1/guicast/vicon.C
index 8ae7a7c0ba667a10ad2978113b1b6fc52bde14db..f9978b26ebf0e917b1d7f6852a26b72dbf670c6d 100644 (file)
--- a/cinelerra-5.1/guicast/vicon.C
+++ b/cinelerra-5.1/guicast/vicon.C
@@ -155,12 +155,6 @@ int VIconThread::keypress_event(int key)
        return 1;
 }
 
-int ViewPopup::button_press_event()
-{
-       vt->set_view_popup(0);
-       return 1;
-}
-
 bool VIconThread::
 visible(VIcon *vicon, int x, int y)
 {
@@ -177,6 +171,7 @@ int ViewPopup::keypress_event()
        int key = get_keypress();
        return vt->keypress_event(key);
 }
+
 ViewPopup::ViewPopup(VIconThread *vt, VFrame *frame, int x, int y, int w, int h)
  : BC_Popup(vt->wdw, x, y, w, h, BLACK)
 {
@@ -239,14 +234,13 @@ int VIconThread::del_vicon(VIcon *&vicon)
 
 void VIconThread::set_view_popup(VIcon *vicon)
 {
-       if( !vicon && this->vicon )
-               this->vicon->stop_audio();
        this->vicon = vicon;
 }
 
 int VIconThread::
 update_view()
 {
+       if( viewing ) viewing->stop_audio();
        delete view_win;  view_win = 0;
        if( (viewing=vicon) != 0 ) {
                VFrame *frame = viewing->frame();