fix awdw solo vicon crash, fix nested clip for binfolders, open edit edl
[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / awindowgui.C
index 384090a2e63d39c96adc7b8c4037786b63830090..7f7300a8a0797c5d2ec90527a8189b14ccd895fc 100644 (file)
@@ -95,6 +95,13 @@ const char *AWindowGUI::folder_names[] =
        N_("Proxy"),
 };
 
+const char *AVIconDrawing::avicon_names[] =
+{
+       N_("Full Play"),
+       N_("Mouse Over"),
+       N_("Src Target"),
+       N_("No Play"),
+};
 
 AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_t length)
  : VIcon(w, h, framerate), Garbage("AssetVIcon")
@@ -102,20 +109,24 @@ AssetVIcon::AssetVIcon(AssetPicon *picon, int w, int h, double framerate, int64_
        this->picon = picon;
        this->length = length;
        temp = 0;
+       broken = 0;
 }
 
 AssetVIcon::~AssetVIcon()
 {
+       if( picon->gui->vicon_thread->solo == this )
+               picon->gui->vicon_thread->solo = 0;
        picon->gui->vicon_thread->del_vicon(this);
        delete temp;
 }
 
 VFrame *AssetVIcon::frame()
 {
+       if( broken ) return 0;
        AssetVIconThread *avt = picon->gui->vicon_thread;
-       Asset *asset = (Asset *)picon->indexable;
-       if( !asset )
-               return *images[0];
+       Indexable *idxbl = picon->indexable;
+       Asset *asset = idxbl && idxbl->is_asset ? (Asset *)idxbl : 0;
+       if( !asset ) return vframes()>0 ? (VFrame*)*images[0] : 0;
        if( !asset->video_data && audio_data && audio_size && length > 0 ) {
                if( !temp ) temp = new VFrame(0, -1, w, h, BC_RGB888, -1);
                temp->clear_frame();
@@ -154,7 +165,10 @@ VFrame *AssetVIcon::frame()
        if( seq_no >= images.size() ) {
                MWindow *mwindow = picon->mwindow;
                File *file = mwindow->video_cache->check_out(asset, mwindow->edl, 1);
-               if( !file ) return 0;
+               if( !file ) {
+                       broken = 1;
+                       return 0;
+               }
                if( temp && (temp->get_w() != asset->width || temp->get_h() != asset->height) ) {
                        delete temp;  temp = 0;
                }
@@ -277,7 +291,9 @@ void AssetVIconAudio::start(AssetVIcon *vicon)
 {
        if( running() ) return;
        interrupted = 0;
-       audio_pos = 0;
+       double pos = vicon->length > 0 ? (double)vicon->seq_no/vicon->length : 0;
+       int audio_len = vicon->audio_size/sizeof(vicon_audio_t);
+       audio_pos = pos * audio_len;
        this->vicon = vicon;
        Thread::start();
 }
@@ -305,9 +321,10 @@ void AssetVIcon::start_audio()
 
 void AssetVIcon::stop_audio()
 {
-       if( playing_audio > 0 )
+       if( playing_audio > 0 ) {
                picon->gui->vicon_audio->stop(0);
-       playing_audio = 0;
+               playing_audio = 0;
+       }
 }
 
 AssetViewPopup::AssetViewPopup(VIconThread *vt, int draw_mode,
@@ -316,37 +333,41 @@ AssetViewPopup::AssetViewPopup(VIconThread *vt, int draw_mode,
 {
        this->draw_mode = draw_mode;
        this->bar_h = (VIEW_POPUP_BAR_H * h) / 200;
+       dragging = 0;
 }
 
 AssetViewPopup::~AssetViewPopup()
 {
 }
 
+int AssetViewPopup::reposition_window(int x, int y, int w, int h)
+{
+       this->bar_h = (VIEW_POPUP_BAR_H * h) / 200;
+       return ViewPopup::reposition_window(x, y, w, h);
+}
+
 int AssetViewPopup::button_press_event()
 {
        if( !is_event_win() ) return 0;
        AssetVIconThread *avt = (AssetVIconThread *)vt;
        if( !avt->vicon ) return 0;
 
-       switch( draw_mode ) {
-       case ASSET_VIEW_MEDIA_MAP:
-       case ASSET_VIEW_FULL:
-               break;
-       default:
-               return 0;
-       }
-
        int dir = 1;
        switch( get_buttonpress() ) {
        case LEFT_BUTTON:
                break;
+       case MIDDLE_BUTTON:
+               avt->set_view_popup(0);
+               return 1;
        case WHEEL_DOWN:
-               dir = -1;
-               // fall thru
+               dir = -1; // fall thru
        case WHEEL_UP:
-               if( draw_mode != ASSET_VIEW_FULL )
-                       return avt->zoom_scale(dir);
-               // fall thru
+               switch( draw_mode ) {
+               case ASSET_VIEW_MEDIA:
+               case ASSET_VIEW_MEDIA_MAP:
+                       avt->zoom_scale(dir);
+                       return 1;
+               } // fall thru
        default:
                return 0;
        }
@@ -398,8 +419,10 @@ int AssetViewPopup::button_press_event()
                vedl->set_inpoint(start);
                vedl->set_outpoint(end);
                vedl->local_session->set_selectionstart(start);
-               vedl->local_session->set_selectionend(end);
-               vwindow->update_position(CHANGE_NONE, 0, 1, 0);
+               vedl->local_session->set_selectionend(start);
+               vwindow->gui->lock_window("AssetViewPopup::button_press_event");
+               vwindow->update_position();
+               vwindow->gui->unlock_window();
                return 1;
        }
        else {
@@ -433,7 +456,7 @@ int AssetViewPopup::button_press_event()
                        }
                }
                mwindow->gui->lock_window("AssetVIcon::popup_button_press");
-               mwindow->select_point(!ctrl_down() && !shift_down() ? pos : start);
+               mwindow->select_point(start);
                edl->local_session->set_selectionstart(start);
                edl->local_session->set_selectionend(!shift_down() ? start : end);
                mwindow->zoom_sample(edl->local_session->zoom_sample);
@@ -452,26 +475,25 @@ int AssetViewPopup::button_release_event()
 
 int AssetViewPopup::cursor_motion_event()
 {
-       if( !is_event_win() ) return 0;
        AssetVIconThread *avt = (AssetVIconThread *)vt;
-       if( !avt->vicon ||
-           ( draw_mode != ASSET_VIEW_FULL &&
-             draw_mode != ASSET_VIEW_MEDIA_MAP ) ) return 0;
-       if( !get_button_down() || get_buttonpress() != LEFT_BUTTON ||
-           ctrl_down() || alt_down() || shift_down() )
-               return 0;
        AssetVIcon *vicon = (AssetVIcon *)avt->vicon;
-       MWindow *mwindow = vicon->picon->mwindow;
-       EDL *edl = mwindow->edl;
-       if( dragging ) {
-               int x = get_cursor_x();
-               double total_length = edl->tracks->total_length();
-               double pos = x * total_length / get_w();
-               mwindow->gui->lock_window("AssetVIcon::popup_cursor_motion");
-               mwindow->select_point(pos);
-               mwindow->zoom_sample(edl->local_session->zoom_sample);
-               mwindow->gui->unlock_window();
-               return 1;
+       if( vicon && dragging && is_event_win() &&
+           get_button_down() && get_buttonpress() == LEFT_BUTTON &&
+           !ctrl_down() && !alt_down() && !shift_down() ) {
+               switch( draw_mode ) {
+               case ASSET_VIEW_MEDIA_MAP:
+               case ASSET_VIEW_FULL:
+                       MWindow *mwindow = vicon->picon->mwindow;
+                       EDL *edl = mwindow->edl;
+                       int x = get_cursor_x();
+                       double total_length = edl->tracks->total_length();
+                       double pos = x * total_length / get_w();
+                       mwindow->gui->lock_window("AssetVIcon::popup_cursor_motion");
+                       mwindow->select_point(pos);
+                       mwindow->zoom_sample(edl->local_session->zoom_sample);
+                       mwindow->gui->unlock_window();
+                       return 1;
+               }
        }
        return 0;
 }
@@ -514,6 +536,7 @@ void AssetViewPopup::draw_vframe(VFrame *vframe)
        double total_length = edl->tracks->total_length();
        if( !total_length ) total_length = 1;
        for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
+               if( !track->record ) continue;
                for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) {
                        Indexable *indexable = (Indexable *)edit->asset;
                        if( !indexable ) indexable = (Indexable *)edit->nested_edl;
@@ -550,6 +573,7 @@ void AssetViewPopup::draw_vframe(VFrame *vframe)
 
 int AssetViewPopup::keypress_event()
 {
+       int result = 0;
        AssetVIconThread *avt = (AssetVIconThread *)vt;
        switch( avt->draw_mode ) {
        case ASSET_VIEW_MEDIA_MAP:
@@ -557,15 +581,15 @@ int AssetViewPopup::keypress_event()
                case 'f':
                case 'F':
                        avt->draw_mode = ASSET_VIEW_FULL;
-                       avt->viewing = 0;
-                       return 1;
+                       result = 1;
                }
                break;
        case ASSET_VIEW_FULL:
                avt->draw_mode = ASSET_VIEW_MEDIA_MAP;
-               avt->viewing = 0;
-               return 1;
+               result = 1;
        }
+       if( result ) // zero change for refresh
+               avt->zoom_scale(0);
        return ViewPopup::keypress_event();
 }
 
@@ -604,15 +628,18 @@ void AssetVIconThread::drawing_stopped()
 void AssetVIconThread::set_view_popup(AssetVIcon *v, int draw_mode)
 {
        gui->stop_vicon_drawing();
-       int mode = !v ? ASSET_VIEW_NONE :
-               draw_mode >= 0 ? draw_mode :
-               this->draw_mode;
-       this->vicon = v;
-       this->draw_mode = mode;
+       this->draw_mode = draw_mode;
+       set_view_popup(v);
        gui->start_vicon_drawing();
 }
 
-ViewPopup *AssetVIconThread::new_view_window()
+void AssetVIconThread::set_view_popup(AssetVIcon *v)
+{
+       if( !v ) draw_mode = ASSET_VIEW_NONE;
+       VIconThread::set_view_popup(v);
+}
+
+ViewPopup *AssetVIconThread::new_view_window(ViewPopup *vpopup)
 {
        BC_WindowBase *parent = wdw->get_parent();
        int rx = 0, ry = 0, rw = 0, rh = 0;
@@ -628,11 +655,32 @@ ViewPopup *AssetVIconThread::new_view_window()
        }
        else
                parent->get_fullscreen_geometry(rx, ry, rw, rh);
-       AssetViewPopup *popup = new AssetViewPopup(this, draw_mode, rx, ry, rw, rh);
-       if( draw_mode == ASSET_VIEW_MEDIA_MAP || draw_mode == ASSET_VIEW_FULL )
-               vicon->playing_audio = -1;
-       wdw->set_active_subwindow(popup);
-       return popup;
+       AssetViewPopup *av_popup = (AssetViewPopup *)vpopup;
+       if( av_popup )
+               av_popup->reposition_window(rx, ry, rw, rh);
+       else
+               av_popup = new AssetViewPopup(this, draw_mode, rx, ry, rw, rh);
+       int playing_audio = gui->play_off ? -1 : 0;
+       if( !playing_audio ) {
+               switch( draw_mode ) {
+               case ASSET_VIEW_NONE:
+               case ASSET_VIEW_ICON:
+               case ASSET_VIEW_MEDIA_MAP:
+               case ASSET_VIEW_FULL:
+                       playing_audio = -1;
+                       break;
+               case ASSET_VIEW_MEDIA:
+                       switch( gui->vicon_drawing ) {
+                       case AVICON_SRC_TARGET:
+                       case AVICON_NO_PLAY:
+                               playing_audio = -1;
+                               break;
+                       }
+               }
+       }
+       vicon->playing_audio = playing_audio;
+       wdw->set_active_subwindow(av_popup);
+       return av_popup;
 }
 
 void AssetVIconThread::close_view_popup()
@@ -829,6 +877,9 @@ void AssetPicon::reset()
        vicon_frame = 0;
        in_use = 1;
        comments_time = 0;
+       comments_rate = -1;
+       comments_ffmt = ' ';
+       comments_type = "";
        id = 0;
        persistent = 0;
 }
@@ -869,17 +920,35 @@ void AssetPicon::create_objects()
        int picon_h = mwindow->preferences->awindow_picon_h;
        pixmap_h = picon_h * BC_WindowBase::get_resources()->icon_scale;
 
-       if( indexable ) {
-               fs.extract_name(name, indexable->path);
+       Asset *asset = 0;
+       EDL *edl = 0;
+       int is_clip = 0;
+
+       if( this->indexable ) {
+               char *cp = name;
+               if( this->indexable->is_asset ) {
+                       asset = (Asset *)indexable;
+                       if( asset->format == FILE_REF ) {
+                               cp += sprintf(cp, "ref:");
+                               set_color(get_color() ^ 0x5599CC);
+                       }
+               }
+               else {
+                       edl = (EDL *)indexable;
+                       cp += sprintf(cp, "edl:");
+//                     set_color(get_color() ^ 0xCC9955);
+               }
+               fs.extract_name(cp, indexable->path);
                set_text(name);
        }
-       else if( edl ) {
-               set_text(strcpy(name, edl->local_session->clip_title));
+       else if( this->edl ) {
+               edl = this->edl;
+               strcpy(name, edl->local_session->clip_title);
                set_text(name);
+               is_clip = 1;
        }
 
-       if( indexable && indexable->is_asset ) {
-               Asset *asset = (Asset*)indexable;
+       if( asset ) {
                if( asset->video_data ) {
                        if( mwindow->preferences->use_thumbnails ) {
                                gui->unlock_window();
@@ -1019,14 +1088,12 @@ void AssetPicon::create_objects()
                }
                struct stat st;
                comments_time = !stat(asset->path, &st) ? st.st_mtime : 0;
+               comments_rate = asset->get_frame_rate();
+               comments_ffmt = asset->format == FILE_FFMPEG ? '=' : '-';
+               comments_type = asset->format == FILE_FFMPEG ?
+                               asset->vcodec : File::formattostr(asset->format);
        }
-       else
-       if( indexable && !indexable->is_asset ) {
-               icon = gui->video_icon;
-               icon_vframe = gui->video_vframe;
-       }
-       else
-       if( edl ) {
+       else if( edl ) {
                if( edl->tracks->playable_video_tracks() ) {
                        if( mwindow->preferences->use_thumbnails ) {
                                gui->unlock_window();
@@ -1034,7 +1101,7 @@ void AssetPicon::create_objects()
                                char clip_icon_path[BCTEXTLEN];
                                char *clip_icon = edl->local_session->clip_icon;
                                VFrame *vframe = 0;
-                               if( clip_icon[0] ) {
+                               if( is_clip && clip_icon[0] ) {
                                        snprintf(clip_icon_path, sizeof(clip_icon_path),
                                                "%s/%s", File::get_config_path(), clip_icon);
                                        vframe = VFramePng::vframe_png(clip_icon_path);
@@ -1060,7 +1127,7 @@ void AssetPicon::create_objects()
                                        close_render_engine();
                                        vframe = new VFrame(avt->vw, avt->vh, BC_RGB888);
                                        vframe->transfer_from(gui->temp_picon);
-                                       if( clip_icon[0] )
+                                       if( this->edl && clip_icon[0] )
                                                vframe->write_png(clip_icon_path);
                                }
                                pixmap_w = pixmap_h * width / height;
@@ -1074,10 +1141,14 @@ void AssetPicon::create_objects()
                                icon->draw_vframe(icon_vframe,
                                        0, 0, pixmap_w, pixmap_h, 0, 0);
                        }
-                       else {
+                       else if( is_clip ) {
                                icon = gui->clip_icon;
                                icon_vframe = gui->clip_vframe;
                        }
+                       else {
+                               icon = gui->video_icon;
+                               icon_vframe = gui->video_vframe;
+                       }
                }
                else
                if( edl->tracks->playable_audio_tracks() ) {
@@ -1085,7 +1156,7 @@ void AssetPicon::create_objects()
                                gui->unlock_window();
                                char clip_icon_path[BCTEXTLEN];
                                char *clip_icon = edl->local_session->clip_icon;
-                               if( clip_icon[0] ) {
+                               if( is_clip && clip_icon[0] ) {
                                        snprintf(clip_icon_path, sizeof(clip_icon_path),
                                                "%s/%s", File::get_config_path(), clip_icon);
                                        icon_vframe = VFramePng::vframe_png(clip_icon_path);
@@ -1121,7 +1192,8 @@ void AssetPicon::create_objects()
                                                        base_colors[i], line_colors[i]);
                                        }
                                        for( int i=0; i<channels; ++i ) delete samples[i];
-                                       if( clip_icon[0] ) icon_vframe->write_png(clip_icon_path);
+                                       if( is_clip && clip_icon[0] )
+                                               icon_vframe->write_png(clip_icon_path);
                                }
                                else {
                                        pixmap_w = icon_vframe->get_w();
@@ -1131,14 +1203,17 @@ void AssetPicon::create_objects()
                                icon->draw_vframe(icon_vframe,
                                        0, 0, pixmap_w, pixmap_h, 0, 0);
                        }
-                       else {
+                       else if( !indexable ) {
                                icon = gui->clip_icon;
                                icon_vframe = gui->clip_vframe;
                        }
+                       else {
+                               icon = gui->audio_icon;
+                               icon_vframe = gui->audio_vframe;
+                       }
                }
        }
-       else
-       if( plugin ) {
+       else if( plugin ) {
                strcpy(name, _(plugin->title));
                set_text(name);
                icon_vframe = plugin->get_picon();
@@ -1177,8 +1252,7 @@ void AssetPicon::create_objects()
                        }
                }
        }
-       else
-       if( label ) {
+       else if( label ) {
                Units::totext(name,
                              label->position,
                              mwindow->edl->session->time_format,
@@ -1201,7 +1275,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
  : BC_Window(_(PROGRAM_NAME ": Resources"),
        mwindow->session->awindow_x, mwindow->session->awindow_y,
        mwindow->session->awindow_w, mwindow->session->awindow_h,
-       100, 100, 1, 1, 1)
+       xS(100), yS(100), 1, 1, 1)
 {
        this->mwindow = mwindow;
        this->awindow = awindow;
@@ -1212,14 +1286,6 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
        video_vframe = 0;               video_icon = 0;
        label_vframe = 0;               label_icon = 0;
 
-       atransition_vframe = 0;         atransition_icon = 0;
-       vtransition_vframe = 0;         vtransition_icon = 0;
-       aeffect_vframe = 0;             aeffect_icon = 0;
-       ladspa_vframe = 0;              ladspa_icon = 0;
-       veffect_vframe = 0;             veffect_icon = 0;
-       ff_aud_vframe = 0;              ff_aud_icon = 0;
-       ff_vid_vframe = 0;              ff_vid_icon = 0;
-
        aeffect_folder_vframe = 0;      aeffect_folder_icon = 0;
        atransition_folder_vframe = 0;  atransition_folder_icon = 0;
        clip_folder_vframe = 0;         clip_folder_icon = 0;
@@ -1253,7 +1319,9 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
        remove_plugin = 0;
        vicon_thread = 0;
        vicon_audio = 0;
-       vicon_drawing = 1;
+       vicon_drawing = AVICON_FULL_PLAY;
+       play_off = 0;
+       tip_info = 0;
        displayed_folder = AW_NO_FOLDER;
        new_folder_thread = 0;
        modify_folder_thread = 0;
@@ -1372,6 +1440,7 @@ void AWindowGUI::plugin_icon(VFrame *&vfrm, BC_Pixmap *&icon, const char *fn, un
 
 void AWindowGUI::create_objects()
 {
+       int ys5 = yS(5), ys10 = yS(10);
        lock_window("AWindowGUI::create_objects");
        asset_titles[0] = C_("Title");
        asset_titles[1] = _("Comments");
@@ -1432,9 +1501,9 @@ void AWindowGUI::create_objects()
 
        int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y;
        int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
-       search_text = new AWindowSearchText(mwindow, this, x1, y1+5);
+       search_text = new AWindowSearchText(mwindow, this, x1, y1+ys5);
        search_text->create_objects();
-       int dy = search_text->get_h() + 10;
+       int dy = search_text->get_h() + ys10;
        y1 += dy;  h1 -= dy;
        add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
 
@@ -1451,9 +1520,16 @@ void AWindowGUI::create_objects()
 
        int fx = mwindow->theme->afolders_x, fy = mwindow->theme->afolders_y;
        int fw = mwindow->theme->afolders_w, fh = mwindow->theme->afolders_h;
-       VFrame **images = mwindow->theme->get_image_set("playpatch_data");
-       AVIconDrawing::calculate_geometry(this, images, &avicon_w, &avicon_h);
-       add_subwindow(avicon_drawing = new AVIconDrawing(this, fw-avicon_w, fy, images));
+       int n = sizeof(AVIconDrawing::avicon_names)/sizeof(AVIconDrawing::avicon_names[0]);
+       int tw = 0;  const char **av_names = AVIconDrawing::avicon_names;
+       for( int i=0; i<n; ++i ) {
+               int nw = get_text_width(MEDIUMFONT, _(av_names[i]));
+               if( tw < nw )  tw = nw;
+       }
+       int pw = BC_PopupMenu::calculate_w(xS(16), tw, 1);
+       const char *text = _(AVIconDrawing::avicon_names[vicon_drawing]);
+       add_subwindow(avicon_drawing = new AVIconDrawing(this, fw, fy, pw, text));
+       avicon_drawing->create_objects();
        add_subwindow(add_tools = new AddTools(mwindow, this, fx, fy, _("Visibility")));
        add_tools->create_objects();
        fy += add_tools->get_h();  fh -= add_tools->get_h();
@@ -1539,10 +1615,11 @@ int AWindowGUI::translation_event()
 
 void AWindowGUI::reposition_objects()
 {
+       int ys5 = yS(5), ys10 = yS(10);
        int x1 = mwindow->theme->alist_x, y1 = mwindow->theme->alist_y;
        int w1 = mwindow->theme->alist_w, h1 = mwindow->theme->alist_h;
-       search_text->reposition_window(x1, y1+5, w1);
-       int dy = search_text->get_h() + 10;
+       search_text->reposition_window(x1, y1+ys5, w1);
+       int dy = search_text->get_h() + ys10;
        y1 += dy;  h1 -= dy;
        asset_list->reposition_window(x1, y1, w1, h1);
        divider->reposition_window(
@@ -1551,7 +1628,7 @@ void AWindowGUI::reposition_objects()
        int fx = mwindow->theme->afolders_x, fy = mwindow->theme->afolders_y;
        int fw = mwindow->theme->afolders_w, fh = mwindow->theme->afolders_h;
        add_tools->resize_event(fw-avicon_w, add_tools->get_h());
-       avicon_drawing->reposition_window(fw-avicon_w, fy);
+       avicon_drawing->reposition_window(fw-avicon_drawing->get_w(), fy);
        fy += add_tools->get_h();  fh -= add_tools->get_h();
        folder_list->reposition_window(fx, fy, fw, fh);
 }
@@ -1560,6 +1637,7 @@ int AWindowGUI::save_defaults(BC_Hash *defaults)
 {
        defaults->update("PLUGIN_VISIBILTY", plugin_visibility);
        defaults->update("VICON_DRAWING", vicon_drawing);
+       defaults->update("TIP_INFO", tip_info);
        return 0;
 }
 
@@ -1567,6 +1645,7 @@ int AWindowGUI::load_defaults(BC_Hash *defaults)
 {
        plugin_visibility = defaults->get("PLUGIN_VISIBILTY", plugin_visibility);
        vicon_drawing = defaults->get("VICON_DRAWING", vicon_drawing);
+       tip_info = defaults->get("TIP_INFO", tip_info);
        return 0;
 }
 
@@ -1586,9 +1665,20 @@ int AWindowGUI::close_event()
        return 1;
 }
 
-void AWindowGUI::start_vicon_drawing()
+int AWindowGUI::start_vicon_drawing()
 {
-       if( !vicon_drawing || !vicon_thread->interrupted ) return;
+       if( play_off ) return stop_vicon_drawing();
+       if( !vicon_thread->interrupted ) return 1;
+       switch( vicon_drawing ) {
+       case AVICON_FULL_PLAY:  // all vicons, viewing, target
+               break;
+       case AVICON_MOUSE_OVER: // one vicon, viewing, target
+               if( vicon_thread->solo ) break;
+       // fall thru
+       case AVICON_SRC_TARGET: // no vicons, no view, target
+       case AVICON_NO_PLAY:    // no vicons, no view, no target
+               return 0;
+       }
        if( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
            mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ||
            mwindow->edl->session->awindow_folder == AW_CLIP_FOLDER ||
@@ -1604,12 +1694,14 @@ void AWindowGUI::start_vicon_drawing()
                        break;
                }
        }
+       return 1;
 }
 
-void AWindowGUI::stop_vicon_drawing()
+int AWindowGUI::stop_vicon_drawing()
 {
-       if( vicon_thread->interrupted ) return;
-       vicon_thread->stop_drawing();
+       if( !vicon_thread->interrupted )
+               vicon_thread->stop_drawing();
+       return 0;
 }
 
 void AWindowGUI::close_view_popup()
@@ -1657,10 +1749,18 @@ int AWindowGUI::cycle_assetlist_format()
        return 1;
 }
 
+void AWindowGUI::hide_tip_info()
+{
+       asset_list->hide_tooltip();
+}
+
+
 AWindowRemovePluginGUI::
 AWindowRemovePluginGUI(AWindow *awindow, AWindowRemovePlugin *thread,
        int x, int y, PluginServer *plugin)
- : BC_Window(_(PROGRAM_NAME ": Remove plugin"), x,y, 500,200, 50, 50, 1, 0, 1, -1, "", 1)
+ : BC_Window(_(PROGRAM_NAME ": Remove plugin"), x,y,
+               xS(500),yS(200), xS(50), yS(50),
+               1, 0, 1, -1, "", 1)
 {
        this->awindow = awindow;
        this->thread = thread;
@@ -1680,17 +1780,19 @@ AWindowRemovePluginGUI::
 
 void AWindowRemovePluginGUI::create_objects()
 {
+       int xs10 = xS(10), xs20 = xS(20);
+       int ys5 = yS(5), ys10 = yS(10);
        lock_window("AWindowRemovePluginGUI::create_objects");
        BC_Button *ok_button = new BC_OKButton(this);
        add_subwindow(ok_button);
        BC_Button *cancel_button = new BC_CancelButton(this);
        add_subwindow(cancel_button);
-       int x = 10, y = 10;
+       int x = xs10, y = ys10;
        BC_Title *title = new BC_Title(x, y, _("remove plugin?"));
        add_subwindow(title);
-       y += title->get_h() + 5;
+       y += title->get_h() + ys5;
        list = new BC_ListBox(x, y,
-               get_w() - 20, ok_button->get_y() - y - 5, LISTBOX_TEXT, &plugin_list,
+               get_w() - xs20, ok_button->get_y() - y - ys5, LISTBOX_TEXT, &plugin_list,
                0, 0, 1, 0, 0, LISTBOX_SINGLE, ICON_LEFT, 0);
        add_subwindow(list);
        show_window();
@@ -1786,6 +1888,10 @@ int AWindowGUI::keypress_event()
                        return 1;
                }
                break;
+       case 'i':
+               tip_info = !tip_info ? 1 : 0;
+               if( !tip_info ) hide_tip_info();
+               return 1;
        case 'o':
                if( !ctrl_down() && !shift_down() ) {
                        assetlist_menu->load_file->handle_event();
@@ -1810,7 +1916,7 @@ int AWindowGUI::keypress_event()
                        return 1;
                }
                unlock_window();
-               mwindow->remove_assets_from_project(1, 1,
+               mwindow->remove_assets_from_project(1, 1, 1,
                        mwindow->session->drag_assets,
                        mwindow->session->drag_clips);
                lock_window("AWindowGUI::keypress_event 2");
@@ -2029,9 +2135,13 @@ void AWindowGUI::update_asset_list()
                        continue;
                }
                if( picon->indexable && picon->indexable->is_asset ) {
+                       Asset *asset = (Asset *)picon->indexable;
                        struct stat st;
-                       picon->comments_time = !stat(picon->indexable->path, &st) ?
-                               st.st_mtime : 0;
+                       picon->comments_time = !stat(asset->path, &st) ? st.st_mtime : 0;
+                       picon->comments_rate = asset->get_frame_rate();
+                       picon->comments_ffmt = asset->format == FILE_FFMPEG ? '=' : '-';
+                       picon->comments_type = asset->format == FILE_FFMPEG ?
+                               asset->vcodec : File::formattostr(asset->format);
                }
        }
 }
@@ -2217,9 +2327,11 @@ void AWindowGUI::copy_picons(AssetPicon *picon, ArrayList<BC_ListBoxItem*> *src)
                        else if( picon->comments_time ) {
                                char date_time[BCSTRLEN];
                                struct tm stm;  localtime_r(&picon->comments_time, &stm);
-                               sprintf(date_time,"%04d.%02d.%02d %02d:%02d:%02d",
+                               sprintf(date_time,"%04d.%02d.%02d %02d:%02d:%02d @%0.2f %c%s",
                                         stm.tm_year+1900, stm.tm_mon+1, stm.tm_mday,
-                                        stm.tm_hour, stm.tm_min, stm.tm_sec);
+                                        stm.tm_hour, stm.tm_min, stm.tm_sec,
+                                       picon->comments_rate, picon->comments_ffmt,
+                                       picon->comments_type);
                                dst[1].append(item2 = new BC_ListBoxItem(date_time));
                        }
                        else
@@ -2408,7 +2520,7 @@ int AWindowDivider::button_press_event()
 int AWindowDivider::cursor_motion_event()
 {
        if( mwindow->session->current_operation == DRAG_PARTITION ) {
-               int wmin = 25;
+               int wmin = xS(25);
                int wmax = mwindow->session->awindow_w - mwindow->theme->adivider_w - wmin;
                int fw = gui->get_relative_cursor_x();
                if( fw > wmax ) fw = wmax;
@@ -2495,6 +2607,7 @@ int AWindowFolders::selection_changed()
 
 int AWindowFolders::button_press_event()
 {
+       gui->hide_tip_info();
        int result = BC_ListBox::button_press_event();
 
        if( !result ) {
@@ -2542,12 +2655,18 @@ int AWindowFolders::load_expanders()
        char expanders_path[BCTEXTLEN];
        mwindow->create_defaults_path(expanders_path, EXPANDERS_FILE);
        FILE *fp = fopen(expanders_path, "r");
+       if( !fp ) {
+               snprintf(expanders_path, sizeof(expanders_path), "%s/%s",
+                       File::get_cindat_path(), EXPANDERS_FILE);
+               char *cp = strrchr(expanders_path,'.');
+               if( cp ) strcpy(cp+1, mwindow->cin_lang);
+               fp = fopen(expanders_path, "r");
+       }
        if( !fp ) {
                snprintf(expanders_path, sizeof(expanders_path), "%s/%s",
                        File::get_cindat_path(), EXPANDERS_FILE);
                fp = fopen(expanders_path, "r");
        }
-
        if( !fp ) return 1;
        const char tab = '\t';
        char line[BCTEXTLEN];   line[0] = 0;
@@ -2616,6 +2735,7 @@ AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, in
 {
        this->mwindow = mwindow;
        this->gui = gui;
+       this->info_tip = -1;
        set_drag_scroll(0);
        set_scroll_stretch(1, 1);
 }
@@ -2626,6 +2746,7 @@ AWindowAssets::~AWindowAssets()
 
 int AWindowAssets::button_press_event()
 {
+       hide_tip_info();
        AssetVIconThread *avt = gui->vicon_thread;
        if( avt->draw_mode != ASSET_VIEW_NONE && is_event_win() ) {
                int dir = 1, button = get_buttonpress();
@@ -2634,7 +2755,7 @@ int AWindowAssets::button_press_event()
                case WHEEL_UP: {
                        int x = get_cursor_x(), y = get_cursor_y();
                        if( avt->cursor_inside(x, y) && avt->view_win )
-                               return avt->zoom_scale(dir);
+                               avt->zoom_scale(dir);
                        return 1; }
                }
        }
@@ -2748,30 +2869,42 @@ int AWindowAssets::selection_changed()
 
                deactivate_selection();
        }
-       else if( gui->vicon_drawing && get_button_down() &&
-               (item = (AssetPicon*)get_selection(0, 0)) != 0 ) {
-               switch( folder ) {
-               case AW_MEDIA_FOLDER:
-               case AW_PROXY_FOLDER:
-               case AWINDOW_USER_FOLDERS:
-                       if( get_buttonpress() == LEFT_BUTTON ||
-                           get_buttonpress() == MIDDLE_BUTTON ) {
-                               AssetVIcon *vicon = 0;
-                               if( !gui->vicon_thread->vicon )
-                                       vicon = item->vicon;
-                               int draw_mode = vicon && get_buttonpress() == MIDDLE_BUTTON ?
-                                       ASSET_VIEW_MEDIA_MAP : ASSET_VIEW_MEDIA;
-                               gui->vicon_thread->set_view_popup(vicon, draw_mode);
-                       }
-                       break;
-               case AW_CLIP_FOLDER:
-                       if( get_buttonpress() == LEFT_BUTTON ) {
-                               AssetVIcon *vicon = 0;
-                               if( !gui->vicon_thread->vicon )
-                                       vicon = item->vicon;
-                               gui->vicon_thread->set_view_popup(vicon, ASSET_VIEW_ICON);
+       else if( get_button_down() && !gui->play_off &&
+                mwindow->edl->session->assetlist_format != ASSETS_TEXT ) {
+               item = (AssetPicon*)get_selection(0, 0);
+               if( item && !get_selection(0, 1) ) {
+                       switch( folder ) {
+                       case AW_MEDIA_FOLDER:
+                       case AW_PROXY_FOLDER:
+                       case AWINDOW_USER_FOLDERS:
+                               if( get_buttonpress() == LEFT_BUTTON ||
+                                   get_buttonpress() == MIDDLE_BUTTON ) {
+                                       AssetVIcon *vicon = 0;
+                                       AssetVIconThread *avt = gui->vicon_thread;
+                                       if( !avt->vicon && gui->vicon_drawing != AVICON_NO_PLAY )
+                                               vicon = item->vicon;
+                                       int draw_mode = !vicon ?
+                                                       ASSET_VIEW_NONE :
+                                               get_buttonpress() == MIDDLE_BUTTON ?
+                                                       ASSET_VIEW_MEDIA_MAP : ASSET_VIEW_MEDIA;
+                                       avt->set_view_popup(vicon, draw_mode);
+                               }
+                               break;
+                       case AW_CLIP_FOLDER:
+                               if( get_buttonpress() == LEFT_BUTTON ) {
+                                       AssetVIcon *vicon = 0;
+                                       AssetVIconThread *avt = gui->vicon_thread;
+                                       if( !avt->vicon && gui->vicon_drawing != AVICON_NO_PLAY )
+                                               vicon = item->vicon;
+                                       gui->vicon_thread->set_view_popup(vicon, ASSET_VIEW_ICON);
+                               }
+                               break;
                        }
-                       break;
+               }
+               else {
+                       gui->vicon_thread->set_view_popup(0);
+                       if( gui->vicon_drawing != AVICON_FULL_PLAY )
+                               gui->stop_vicon_drawing();
                }
        }
        return 1;
@@ -2784,12 +2917,13 @@ void AWindowAssets::draw_background()
        set_font(LARGEFONT);
        int folder = mwindow->edl->session->awindow_folder;
        const char *title = mwindow->edl->get_folder_name(folder);
-       draw_text(get_w() - get_text_width(LARGEFONT, title) - 4, 30,
+       draw_text(get_w() - get_text_width(LARGEFONT, title) - xS(4), yS(30),
                title, -1, get_bg_surface());
 }
 
 int AWindowAssets::drag_start_event()
 {
+       gui->vicon_thread->set_view_popup(0);
        int collect_pluginservers = 0;
        int collect_assets = 0, proxy = 0;
 
@@ -2942,16 +3076,35 @@ int AWindowAssets::column_resize_event()
        return 1;
 }
 
-int AWindowAssets::focus_in_event()
+int AWindowAssets::cursor_enter_event()
 {
-       int ret = BC_ListBox::focus_in_event();
-       gui->start_vicon_drawing();
+       int ret = BC_ListBox::cursor_enter_event();
+       switch( gui->vicon_drawing ) {
+       case AVICON_FULL_PLAY:
+               gui->start_vicon_drawing();
+               break;
+       case AVICON_MOUSE_OVER:
+       case AVICON_SRC_TARGET:
+       case AVICON_NO_PLAY:
+       default:
+               break;
+       }
        return ret;
 }
 
+int AWindowAssets::cursor_leave_event()
+{
+       hide_tip_info();
+       if( !is_event_win() ) return 0;
+       if( !gui->vicon_thread->viewing )
+               gui->stop_vicon_drawing();
+       return BC_ListBox::cursor_leave_event();
+}
+
 int AWindowAssets::focus_out_event()
 {
        gui->stop_vicon_drawing();
+       gui->vicon_thread->set_view_popup(0);
        return BC_ListBox::focus_out_event();
 }
 
@@ -2969,12 +3122,55 @@ void AWindowAssets::update_vicon_area()
 
 int AWindowAssets::mouse_over_event(int no)
 {
-       if( gui->vicon_thread->viewing &&
-           no >= 0 && no < gui->displayed_assets[0].size() ) {
-               AssetPicon *picon = (AssetPicon *)gui->displayed_assets[0][no];
-               gui->vicon_thread->set_view_popup(picon->vicon);
+       AssetPicon *picon = no >= 0 && no < gui->displayed_assets[0].size() ?
+               (AssetPicon *)gui->displayed_assets[0][no] : 0;
+       AssetVIcon *vicon = !picon ? 0 : picon->vicon;
+       switch( gui->vicon_drawing ) {
+       case AVICON_FULL_PLAY:
+               gui->vicon_thread->solo = 0;
+               if( vicon && gui->vicon_thread->viewing )
+                       gui->vicon_thread->set_view_popup(vicon);
+               break;
+       case AVICON_MOUSE_OVER:
+               if( !vicon ) break;
+               gui->vicon_thread->solo = vicon;
+               gui->start_vicon_drawing();
+       // fall thru
+       case AVICON_SRC_TARGET:
+               if( !vicon ) break;
+               if( gui->vicon_thread->viewing )
+                       gui->vicon_thread->set_view_popup(vicon);
+               break;
+       case AVICON_NO_PLAY:
+       default:
+               break;
        }
-       return 0;
+       if( no < 0 && info_tip >= 0 ) {
+               hide_tip_info();
+       }
+       if( gui->tip_info && no >= 0 &&
+           info_tip != no && picon && picon->plugin ) {
+               const char *info = picon->plugin->tip;
+               if( !info ) info = _("No info available");
+               show_tip_info(info, no);
+       }
+       return 1;
+}
+
+void AWindowAssets::show_tip_info(const char *info, int no)
+{
+       int tw = get_text_width(MEDIUMFONT, info) + TOOLTIP_MARGIN * 2;
+       int th = get_text_height(MEDIUMFONT, info) + TOOLTIP_MARGIN * 2;
+       int tx = get_w() - (tw + xS(28));
+       int ty = get_h() - (th + yS(28));
+       show_tooltip(info, tx, ty, tw, th);
+       info_tip = no;
+}
+
+void AWindowAssets::hide_tip_info()
+{
+       hide_tooltip();
+       info_tip = -1;
 }
 
 
@@ -2999,10 +3195,11 @@ AWindowSearchText::AWindowSearchText(MWindow *mwindow, AWindowGUI *gui, int x, i
 
 void AWindowSearchText::create_objects()
 {
-       int x1 = x, y1 = y, margin = 10;
+       int xs10 = xS(10);
+       int x1 = x, y1 = y;
        gui->add_subwindow(text_title = new BC_Title(x1, y1, _("Search:")));
-       x1 += text_title->get_w() + margin;
-       int w1 = gui->get_w() - x1 - 2*margin;
+       x1 += text_title->get_w() + xs10;
+       int w1 = gui->get_w() - x1 - 2*xs10;
        gui->add_subwindow(text_box = new AWindowSearchTextBox(this, x1, y1, w1));
 }
 
@@ -3014,7 +3211,7 @@ int AWindowSearchText::handle_event()
 
 int AWindowSearchText::get_w()
 {
-       return text_box->get_w() + text_title->get_w() + 10;
+       return text_box->get_w() + text_title->get_w() + xS(10);
 }
 
 int AWindowSearchText::get_h()
@@ -3024,10 +3221,11 @@ int AWindowSearchText::get_h()
 
 void AWindowSearchText::reposition_window(int x, int y, int w)
 {
-       int x1 = x, y1 = y, margin = 10;
+       int xs10 = xS(10);
+       int x1 = x, y1 = y;
        text_title->reposition_window(x1, y1);
-       x1 += text_title->get_w() + margin;
-       int w1 = gui->get_w() - x1 - 2*margin;
+       x1 += text_title->get_w() + xs10;
+       int w1 = gui->get_w() - x1 - 2*xs10;
        text_box->reposition_window(x1, y1, w1);
 }
 
@@ -3136,7 +3334,7 @@ int AWindowView::handle_event()
 }
 
 AddTools::AddTools(MWindow *mwindow, AWindowGUI *gui, int x, int y, const char *title)
- : BC_PopupMenu(x, y, BC_Title::calculate_w(gui, title, MEDIUMFONT)+8, title, -1, 0, 4)
+ : BC_PopupMenu(x, y, title, -1, 0)
 {
        this->mwindow = mwindow;
        this->gui = gui;
@@ -3207,36 +3405,71 @@ int AddPluginItem::handle_event()
        return 1;
 }
 
-AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, VFrame **images)
- : BC_Toggle(x, y, images, agui->vicon_drawing)
+AVIconDrawingItem::AVIconDrawingItem(AVIconDrawing *avicon, const char *text, int id)
+ : BC_MenuItem(text)
 {
-       this->agui = agui;
-       set_tooltip(_("Preview"));
+       this->avicon = avicon;
+       this->id = id;
+}
+
+int AVIconDrawingItem::handle_event()
+{
+       for( int i=0; i<AVICON_PLAY_MODES; ++i ) {
+               AVIconDrawingItem *item = (AVIconDrawingItem *) avicon->get_item(i);
+               item->set_checked(id == i);
+       }
+       AWindowGUI *agui = avicon->agui;
+       agui->play_off = 0;
+       avicon->set_text(get_text());
+       agui->stop_vicon_drawing();
+       agui->vicon_thread->set_view_popup(0);
+       agui->vicon_thread->solo = 0;
+       agui->vicon_drawing = id;
+       agui->start_vicon_drawing();
+       return 1;
+}
+
+int AVIconDrawing::draw_face(int dx, int color)
+{
+       int ret = BC_PopupMenu::draw_face(dx, color);
+       if( agui->play_off && agui->vicon_drawing != AVICON_NO_PLAY ) {
+               int lx = get_margin(), ly = get_h()/2;
+               draw_line(lx,ly, get_w()-2*lx,ly);
+       }
+       return ret;
 }
 
-void AVIconDrawing::calculate_geometry(AWindowGUI *agui, VFrame **images, int *ww, int *hh)
+AVIconDrawing::AVIconDrawing(AWindowGUI *agui, int x, int y, int w, const char *text)
+ : BC_PopupMenu(x-w, y, w, text, 1, 0, 4)
 {
-       int text_line = -1, toggle_x = -1, toggle_y = -1;
-       int text_x = -1, text_y = -1, text_w = -1, text_h = -1;
-       BC_Toggle::calculate_extents(agui, images, 1,
-               &text_line, ww, hh, &toggle_x, &toggle_y,
-               &text_x, &text_y, &text_w, &text_h, "", MEDIUMFONT);
+       this->agui = agui;
 }
 
 AVIconDrawing::~AVIconDrawing()
 {
 }
 
-int AVIconDrawing::handle_event()
+void AVIconDrawing::create_objects()
 {
-       agui->vicon_drawing = get_value();
-       if( agui->vicon_drawing )
-               agui->start_vicon_drawing();
-       else
-               agui->stop_vicon_drawing();
-       return 1;
+       AVIconDrawingItem *item;
+       for( int i=0; i<AVICON_PLAY_MODES; ++i ) {
+               add_item(item = new AVIconDrawingItem(this, avicon_names[i], i));
+               item->set_checked(agui->vicon_drawing == i);
+       }
 }
 
+int AVIconDrawing::button_press_event()
+{
+       if( !is_event_win() ) return 0;
+       if( get_buttonpress() == MIDDLE_BUTTON ) {
+               agui->play_off = !agui->play_off ? 1 : 0;
+               draw_face(0, -1);
+               flash(1);
+               agui->start_vicon_drawing();
+               return 1;
+       }
+       return BC_PopupMenu::button_press_event();
+}
 
 AWindowListFormat::AWindowListFormat(MWindow *mwindow, AWindowGUI *gui)
  : BC_MenuItem("","v",'v')