vicon placement tweak, bclistbox select fixes, new ctrl-a/s shortcuts
[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / awindowgui.C
index 30ae58b39a2f1afcafe649d059c83523b86615a7..072f878e80fd933c8bb4dcb88503763c13f691a0 100644 (file)
@@ -54,6 +54,7 @@
 #include "labels.h"
 #include "labelpopup.h"
 #include "localsession.h"
+#include "mainerror.h"
 #include "mainmenu.h"
 #include "mainsession.h"
 #include "mwindowgui.h"
@@ -111,9 +112,12 @@ AssetVIcon::~AssetVIcon()
 
 VFrame *AssetVIcon::frame()
 {
+       AssetVIconThread *avt = picon->gui->vicon_thread;
        Asset *asset = (Asset *)picon->indexable;
+       if( !asset )
+               return *images[0];
        if( !asset->video_data && audio_data && audio_size && length > 0 ) {
-               if( !temp ) temp = new VFrame(0, -1, vw, vh, BC_RGB888, -1);
+               if( !temp ) temp = new VFrame(0, -1, w, h, BC_RGB888, -1);
                temp->clear_frame();
                int sample_rate = asset->get_sample_rate();
                int64_t audio_samples = asset->get_audio_samples();
@@ -134,16 +138,15 @@ VFrame *AssetVIcon::frame()
                while( i < len ) data[i++] = *audio_data++ * sample_scale;
                while( i < bfrsz ) data[i++] = 0;
                picon->draw_wave(temp, data, bfrsz, RED, GREEN);
-               int x = (vw-1) * line_pos;
+               int x = (w-1) * line_pos;
                temp->pixel_rgb = RED;
-               temp->draw_line(x,0, x,vh);
+               temp->draw_line(x,0, x,h);
                return temp;
        }
-       int ww = picon->gui->vicon_thread->view_w;
-       int hh = picon->gui->vicon_thread->view_h;
+       int vw = avt->vw, vh = avt->vh, vicon_cmodel = avt->vicon_cmodel;
        if( !asset->video_data ) {
                if( !temp ) {
-                       temp = new VFrame(0, -1, ww, hh, BC_RGB888, -1);
+                       temp = new VFrame(0, -1, vw, vh, BC_RGB888, -1);
                        temp->clear_frame();
                }
                return temp;
@@ -166,7 +169,7 @@ VFrame *AssetVIcon::frame()
                        int64_t pos = images.size() / picon->gui->vicon_thread->refresh_rate * frame_rate;
                        file->set_video_position(pos,0);
                        if( file->read_frame(temp) ) temp->clear_frame();
-                       add_image(temp, ww, hh, BC_RGB8);
+                       add_image(temp, vw, vh, vicon_cmodel);
                }
                mwindow->video_cache->check_in(asset);
        }
@@ -307,16 +310,42 @@ void AssetVIcon::stop_audio()
        playing_audio = 0;
 }
 
-int AssetVIcon::popup_button_press(int x, int y)
+AssetViewPopup::AssetViewPopup(VIconThread *vt, int draw_mode,
+               int x, int y, int w, int h)
+ : ViewPopup(vt, x, y, w, h)
 {
-       if( playing_audio >= 0 ) return 0;
-       VIconThread *vt = picon->gui->vicon_thread;
-       ViewPopup *view_win = vt->view_win;
-       if( !view_win || !view_win->is_event_win() ) return 0;
-       int view_w = view_win->get_w(), view_h = view_win->get_h();
+       this->draw_mode = draw_mode;
+       this->bar_h = (VIEW_POPUP_BAR_H * h) / 200;
+}
+
+AssetViewPopup::~AssetViewPopup()
+{
+}
+
+int AssetViewPopup::button_press_event()
+{
+       if( !is_event_win() ) return 0;
+       AssetVIconThread *avt = (AssetVIconThread *)vt;
+       if( !avt->vicon ) return 0;
+
+       int dir = 1, button = get_buttonpress();
+       switch( button ) {
+       case WHEEL_DOWN: dir = -1; // fall thru
+       case WHEEL_UP:   return zoom_scale(dir);
+       case LEFT_BUTTON:
+               break;
+       default:
+               return 0;
+       }
+
+       if( draw_mode != ASSET_VIEW_MEDIA_MAP ) return 0;
+       int x = get_cursor_x(), y = get_cursor_y();
+       AssetVIcon *vicon = (AssetVIcon *)avt->vicon;
+       AssetPicon *picon = vicon->picon;
        MWindow *mwindow = picon->mwindow;
        EDL *edl = mwindow->edl;
-       if( y < VIEW_POPUP_BAR_H ) {
+       dragging = 0;
+       if( y < bar_h ) {
                Indexable *idxbl =
                        picon->indexable ? picon->indexable :
                        picon->edl ? picon->edl : 0;
@@ -328,7 +357,7 @@ int AssetVIcon::popup_button_press(int x, int y)
                double video_length = frame_rate > 0 && idxbl->have_video() ?
                        idxbl->get_video_frames() / frame_rate : 0;
                double idxbl_length = bmax(audio_length, video_length);
-               double pos = x * idxbl_length / view_w;
+               double pos = x * idxbl_length / get_w();
                double start = 0, end = idxbl_length;
                double lt = DBL_MAX, rt = DBL_MAX;
                for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
@@ -361,22 +390,69 @@ int AssetVIcon::popup_button_press(int x, int y)
                vwindow->update_position(CHANGE_NONE, 0, 1, 0);
                return 1;
        }
-       return y < view_h-VIEW_POPUP_BAR_H ? 0 : popup_cursor_motion(x, y);
+       if( y >= get_h()-bar_h ) {
+               dragging = 1;
+               if( !ctrl_down() && !shift_down() )
+                       return cursor_motion_event();
+               Indexable *idxbl =
+                       picon->indexable ? picon->indexable :
+                       picon->edl ? picon->edl : 0;
+               if( !idxbl ) return 0;
+               double total_length = mwindow->edl->tracks->total_length();
+               double pos = x * total_length / get_w();
+               double start = 0, end = total_length;
+               double lt = DBL_MAX, rt = DBL_MAX;
+               for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
+                       for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) {
+                               Indexable *indexable = (Indexable *)edit->asset;
+                               if( !indexable ) indexable = (Indexable *)edit->nested_edl;
+                               if( !indexable ) continue;
+                               if( indexable->id == idxbl->id ||
+                                   (!indexable->is_asset == !idxbl->is_asset &&
+                                    !strcmp(indexable->path, idxbl->path)) ) {
+                                       double start_pos = track->from_units(edit->startproject);
+                                       double end_pos = track->from_units(edit->startproject + edit->length);
+                                       double dlt = pos - start_pos, drt = end_pos - pos;
+                                       if( dlt >= 0 &&  dlt < lt ) { lt = dlt;  start = start_pos; }
+                                       else if( dlt < 0 && -dlt < rt ) { rt = -dlt;  end = start_pos; }
+                                       if( drt >= 0 &&  drt < rt ) { rt = drt;  end = end_pos; }
+                                       else if( drt < 0 && -drt < lt ) { lt = -drt; start = end_pos; }
+                               }
+                       }
+               }
+               mwindow->gui->lock_window("AssetVIcon::popup_button_press");
+               mwindow->select_point(!ctrl_down() && !shift_down() ? pos : start);
+               edl->local_session->set_selectionstart(start);
+               edl->local_session->set_selectionend(!shift_down() ? start : end);
+               mwindow->zoom_sample(edl->local_session->zoom_sample);
+               mwindow->gui->unlock_window();
+               return 1;
+       }
+       return 0;
 }
 
-int AssetVIcon::popup_cursor_motion(int x, int y)
+int AssetViewPopup::button_release_event()
 {
-       if( playing_audio >= 0 ) return 0;
-       VIconThread *vt = picon->gui->vicon_thread;
-       ViewPopup *view_win = (ViewPopup *)vt->view_win;
-       if( !view_win || !view_win->is_event_win() ||
-           !view_win->get_button_down() ) return 0;
-       int view_w = view_win->get_w(), view_h = view_win->get_h();
-       MWindow *mwindow = picon->mwindow;
+       if( !is_event_win() ) return 0;
+       dragging = 0;
+       return 1;
+}
+
+int AssetViewPopup::cursor_motion_event()
+{
+       if( !is_event_win() ) return 0;
+       AssetVIconThread *avt = (AssetVIconThread *)vt;
+       if( !avt->vicon || 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( y >= view_h-VIEW_POPUP_BAR_H ) {
+       if( dragging ) {
+               int x = get_cursor_x();
                double total_length = edl->tracks->total_length();
-               double pos = x * total_length / view_w;
+               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);
@@ -386,6 +462,127 @@ int AssetVIcon::popup_cursor_motion(int x, int y)
        return 0;
 }
 
+void AssetViewPopup::draw_vframe(VFrame *vframe) 
+{
+       switch( draw_mode ) {
+       case ASSET_VIEW_MEDIA:
+       case ASSET_VIEW_ICON:
+               ViewPopup::draw_vframe(vframe);
+       case ASSET_VIEW_NONE:
+       default:
+               return;
+       case ASSET_VIEW_MEDIA_MAP:
+               break;
+       }
+       set_color(BLACK);
+       draw_box(0,0,get_w(),get_h());
+       int y1 = bar_h;
+       int y2 = get_h()-bar_h;
+       BC_WindowBase::draw_vframe(vframe, 0,y1, get_w(),y2-y1);
+       AssetVIconThread *avt = (AssetVIconThread *)vt;
+       AssetVIcon *vicon = (AssetVIcon *)avt->vicon;
+       AssetPicon *picon = (AssetPicon *)vicon->picon;
+       Indexable *idxbl =
+               picon->indexable ? picon->indexable :
+               picon->edl ? picon->edl : 0;
+       if( !idxbl ) return;
+       double sample_rate = idxbl->get_sample_rate();
+       double audio_length = sample_rate > 0 && idxbl->have_audio() ?
+               idxbl->get_audio_samples() / sample_rate : 0;
+       double frame_rate = idxbl->get_frame_rate();
+       double video_length = frame_rate > 0 && idxbl->have_video() ?
+               idxbl->get_video_frames() / frame_rate : 0;
+       double idxbl_length = bmax(audio_length, video_length);
+       if( !idxbl_length ) idxbl_length = 1;
+
+       EDL *edl = picon->mwindow->edl;
+       double total_length = edl->tracks->total_length();
+       if( !total_length ) total_length = 1;
+       for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
+               for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) {
+                       Indexable *indexable = (Indexable *)edit->asset;
+                       if( !indexable ) indexable = (Indexable *)edit->nested_edl;
+                       if( !indexable ) continue;
+                       if( indexable->id == idxbl->id ||
+                           (!indexable->is_asset == !idxbl->is_asset &&
+                            !strcmp(indexable->path, idxbl->path)) ) {
+                               double pos1 = track->from_units(edit->startsource);
+                               double pos2 = track->from_units(edit->startsource + edit->length);
+                               double xscale = get_w() / idxbl_length;
+                               int ex1 = pos1 * xscale, ex2 = pos2 * xscale;
+                               set_color(WHITE);
+                               draw_box(ex1,0, ex2-ex1,y1);
+                               set_color(BLACK);
+                               draw_line(ex1,0, ex1,y1);
+                               draw_line(ex2,0, ex2,y1);
+                               pos1 = track->from_units(edit->startproject);
+                               pos2 = track->from_units(edit->startproject + edit->length);
+                               xscale = get_w() / total_length;
+                               int px1 = pos1 * xscale, px2 = pos2 * xscale;
+                               set_color(RED);
+                               draw_box(px1,y2, px2-px1,get_h()-y2);
+                               set_color(BLACK);
+                               draw_line(px1,y2, px1,get_h()-1);
+                               draw_line(px2,y2, px2,get_h()-1);
+
+                               set_color(YELLOW);
+                               draw_line(ex1,y1, px1,y2);
+                               draw_line(ex2,y1, px2,y2);
+                       }
+               }
+       }
+}
+
+
+AssetVIconThread::AssetVIconThread(AWindowGUI *gui, Preferences *preferences)
+ : VIconThread(gui->asset_list, preferences->vicon_size * 16/9, preferences->vicon_size,
+       4*preferences->awindow_picon_h * 16/9, 4*preferences->awindow_picon_h)
+{
+       this->gui = gui;
+       draw_mode = ASSET_VIEW_NONE;
+       int vicon_cmodel = BC_RGB8;
+       switch( preferences->vicon_color_mode ) {
+       case VICON_COLOR_MODE_LOW:   vicon_cmodel = BC_RGB8;    break;
+       case VICON_COLOR_MODE_MED:   vicon_cmodel = BC_RGB565;  break;
+       case VICON_COLOR_MODE_HIGH:  vicon_cmodel = BC_RGB888;  break;
+       }
+       this->vicon_cmodel = vicon_cmodel;
+}
+
+AssetVIconThread::~AssetVIconThread()
+{
+}
+
+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;
+       gui->start_vicon_drawing();
+}
+
+ViewPopup *AssetVIconThread::new_view_window()
+{
+       BC_WindowBase *parent = wdw->get_parent();
+       XineramaScreenInfo *info = parent->get_xinerama_info(-1);
+       int cx = info ? info->x_org + info->width/2 : parent->get_root_w(0)/2;
+       int cy = info ? info->y_org + info->height/2 : parent->get_root_h(0)/2;
+       int vx = viewing->get_vx(), rx = 0;
+       int vy = viewing->get_vy(), ry = 0;
+       wdw->get_root_coordinates(vx, vy, &rx, &ry);
+       rx += (rx >= cx ? -view_w+viewing->w/4 : viewing->w-viewing->w/4);
+       ry += (ry >= cy ? -view_h+viewing->h/4 : viewing->h-viewing->h/4);
+       AssetViewPopup *popup = new AssetViewPopup(this, draw_mode,
+               rx, ry, view_w, view_h);
+       if( draw_mode == ASSET_VIEW_MEDIA_MAP )
+               vicon->playing_audio = -1;
+       wdw->set_active_subwindow(popup);
+       return popup;
+}
+
 
 AWindowFolderItem::AWindowFolderItem()
  : BC_ListBoxItem()
@@ -610,7 +807,8 @@ void AssetPicon::create_objects()
        char name[BCTEXTLEN];
        int pixmap_w, pixmap_h;
 
-       pixmap_h = 50 * BC_WindowBase::get_resources()->icon_scale;
+       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);
@@ -664,7 +862,8 @@ void AssetPicon::create_objects()
                                        icon_vframe = new VFrame(0,
                                                -1, pixmap_w, pixmap_h, BC_RGB888, -1);
                                        icon_vframe->transfer_from(gui->temp_picon);
-                                       if( asset->folder_no == AW_MEDIA_FOLDER ) {
+                                       if( asset->folder_no == AW_MEDIA_FOLDER ||
+                                           asset->folder_no == AW_PROXY_FOLDER ) {
 // vicon images
                                                double framerate = asset->get_frame_rate();
                                                if( !framerate ) framerate = VICON_RATE;
@@ -682,27 +881,9 @@ void AssetPicon::create_objects()
                                                }
                                                gui->vicon_thread->add_vicon(vicon);
                                        }
-                                       else if( asset->folder_no == AW_PROXY_FOLDER ) {
-                                               char unproxy_path[BCTEXTLEN];
-                                               int proxy_scale = mwindow->edl->session->proxy_scale;
-                                               if( !ProxyRender::from_proxy_path(unproxy_path, asset, proxy_scale) ) {
-                                                       Asset *unproxy = mwindow->edl->assets->get_asset(unproxy_path);
-                                                       if( unproxy ) {
-                                                               int i = gui->assets.total;
-                                                               while( --i >= 0 ) {
-                                                                       AssetPicon *picon = (AssetPicon*)gui->assets[i];
-                                                                       if( picon->id == unproxy->id ) {
-                                                                               vicon = picon->vicon;
-                                                                               if( vicon ) vicon->add_user();
-                                                                               break;
-                                                                       }
-                                                               }
-                                                       }
-                                               }
-                                       }
-
                                }
                                else {
+                                       eprintf("Unable to open %s\nin asset: %s",asset->path, get_text());
                                        gui->lock_window("AssetPicon::create_objects 2");
                                        icon = gui->video_icon;
                                        icon_vframe = gui->video_vframe;
@@ -765,6 +946,7 @@ void AssetPicon::create_objects()
                                                0, 0, pixmap_w, pixmap_h, 0, 0);
                                }
                                else {
+                                       eprintf("Unable to open %s\nin asset: %s",asset->path, get_text());
                                        gui->lock_window("AssetPicon::create_objects 5");
                                        icon = gui->audio_icon;
                                        icon_vframe = gui->audio_vframe;
@@ -789,32 +971,26 @@ void AssetPicon::create_objects()
                if( edl->tracks->playable_video_tracks() ) {
                        if( mwindow->preferences->use_thumbnails ) {
                                gui->unlock_window();
+                               AssetVIconThread *avt = gui->vicon_thread;
                                char clip_icon_path[BCTEXTLEN];
                                char *clip_icon = edl->local_session->clip_icon;
+                               VFrame *vframe = 0;
                                if( 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);
+                                       vframe = VFramePng::vframe_png(clip_icon_path);
                                }
-                               if( !icon_vframe ) {
+                               if( vframe &&
+                                   ( vframe->get_w() != avt->vw || vframe->get_h() != avt->vh ) ) {
+                                       delete vframe;  vframe = 0;
+                               }
+                               int edl_h = edl->get_h(), edl_w = edl->get_w();
+                               int height = edl_h > 0 ? edl_h : 1;
+                               int width = edl_w > 0 ? edl_w : 1;
+                               int color_model = edl->session->color_model;
+                               if( !vframe ) {
 //printf("render clip: %s\n", name);
-                                       int edl_h = edl->get_h(), edl_w = edl->get_w();
-                                       int height = edl_h > 0 ? edl_h : 1;
-                                       int width = edl_w > 0 ? edl_w : 1;
-                                       int color_model = edl->session->color_model;
-                                       pixmap_w = pixmap_h * width / height;
-
-                                       if( gui->temp_picon &&
-                                           (gui->temp_picon->get_color_model() != color_model ||
-                                            gui->temp_picon->get_w() != width ||
-                                            gui->temp_picon->get_h() != height) ) {
-                                               delete gui->temp_picon;  gui->temp_picon = 0;
-                                       }
-
-                                       if( !gui->temp_picon ) {
-                                               gui->temp_picon = new VFrame(0, -1,
-                                                       width, height, color_model, -1);
-                                       }
+                                       VFrame::get_temp(gui->temp_picon, width, height, color_model);
                                        char string[BCTEXTLEN];
                                        sprintf(string, _("Rendering %s"), name);
                                        mwindow->gui->lock_window("AssetPicon::create_objects");
@@ -823,15 +999,17 @@ void AssetPicon::create_objects()
                                        open_render_engine(edl, 0);
                                        render_video(0, gui->temp_picon);
                                        close_render_engine();
-                                       icon_vframe = new VFrame(0,
-                                               -1, pixmap_w, pixmap_h, BC_RGB888, -1);
-                                       icon_vframe->transfer_from(gui->temp_picon);
-                                       if( clip_icon[0] ) icon_vframe->write_png(clip_icon_path);
-                               }
-                               else {
-                                       pixmap_w = icon_vframe->get_w();
-                                       pixmap_h = icon_vframe->get_h();
+                                       vframe = new VFrame(avt->vw, avt->vh, BC_RGB888);
+                                       vframe->transfer_from(gui->temp_picon);
+                                       if( clip_icon[0] )
+                                               vframe->write_png(clip_icon_path);
                                }
+                               pixmap_w = pixmap_h * width / height;
+                               vicon = new AssetVIcon(this, pixmap_w, pixmap_h, VICON_RATE, 1);
+                               vicon->add_image(vframe, avt->vw, avt->vh, avt->vicon_cmodel);
+                               icon_vframe = new VFrame(pixmap_w, pixmap_h, BC_RGB888);
+                               icon_vframe->transfer_from(vframe);
+                               delete vframe;
                                gui->lock_window("AssetPicon::create_objects 0");
                                icon = new BC_Pixmap(gui, pixmap_w, pixmap_h);
                                icon->draw_vframe(icon_vframe,
@@ -1201,7 +1379,7 @@ void AWindowGUI::create_objects()
        y1 += dy;  h1 -= dy;
        add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
 
-       vicon_thread = new VIconThread(asset_list);
+       vicon_thread = new AssetVIconThread(this, mwindow->preferences);
        asset_list->update_vicon_area();
        vicon_thread->start();
        vicon_audio = new AssetVIconAudio(this);
@@ -1354,6 +1532,7 @@ void AWindowGUI::start_vicon_drawing()
        if( !vicon_drawing || !vicon_thread->interrupted ) return;
        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 ||
            mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) {
                switch( mwindow->edl->session->assetlist_format ) {
                case ASSETS_ICONS:
@@ -1381,7 +1560,7 @@ VFrame *AssetPicon::get_vicon_frame()
        VFrame *frame = vicon->frame();
        if( !frame ) return 0;
        if( !vicon_frame )
-               vicon_frame = new VFrame(vicon->vw, vicon->vh, frame->get_color_model());
+               vicon_frame = new VFrame(vicon->w, vicon->h, frame->get_color_model());
        vicon_frame->transfer_from(frame);
        return vicon_frame;
 }
@@ -2236,7 +2415,7 @@ int AWindowFolders::selection_changed()
 
                gui->stop_vicon_drawing();
 
-               if( get_button_down() && get_buttonpress() == 3 ) {
+               if( get_button_down() && get_buttonpress() == RIGHT_BUTTON ) {
                        gui->folderlist_menu->update_titles();
                        gui->folderlist_menu->activate_menu();
                }
@@ -2252,19 +2431,17 @@ int AWindowFolders::selection_changed()
 
 int AWindowFolders::button_press_event()
 {
-       int result = 0;
-
-       result = BC_ListBox::button_press_event();
+       int result = BC_ListBox::button_press_event();
 
        if( !result ) {
-               if( get_buttonpress() == 3 && is_event_win() && cursor_inside() ) {
+               if( get_buttonpress() == RIGHT_BUTTON &&
+                   is_event_win() && cursor_inside() ) {
                        gui->folderlist_menu->update_titles();
                        gui->folderlist_menu->activate_menu();
                        result = 1;
                }
        }
 
-
        return result;
 }
 
@@ -2377,7 +2554,6 @@ AWindowAssets::AWindowAssets(MWindow *mwindow, AWindowGUI *gui, int x, int y, in
        this->gui = gui;
        set_drag_scroll(0);
        set_scroll_stretch(1, 1);
-       draw_func = 0;
 }
 
 AWindowAssets::~AWindowAssets()
@@ -2386,11 +2562,23 @@ AWindowAssets::~AWindowAssets()
 
 int AWindowAssets::button_press_event()
 {
-       int result = 0;
+       AssetVIconThread *avt = gui->vicon_thread;
+       if( avt->draw_mode != ASSET_VIEW_NONE && is_event_win() ) {
+               int dir = 1, button = get_buttonpress();
+               switch( button ) {
+               case WHEEL_DOWN: dir = -1;  // fall thru
+               case WHEEL_UP: {
+                       int x = get_cursor_x(), y = get_cursor_y();
+                       if( avt->cursor_inside(x, y) && avt->view_win )
+                               return avt->view_win->zoom_scale(dir);
+                       return 1; }
+               }
+       }
 
-       result = BC_ListBox::button_press_event();
+       int result = BC_ListBox::button_press_event();
 
-       if( !result && get_buttonpress() == 3 && is_event_win() && cursor_inside() ) {
+       if( !result && get_buttonpress() == RIGHT_BUTTON &&
+           is_event_win() && cursor_inside() ) {
                BC_ListBox::deactivate_selection();
                int folder = mwindow->edl->session->awindow_folder;
                switch( folder ) {
@@ -2462,9 +2650,9 @@ int AWindowAssets::selection_changed()
 {
 // Show popup window
        AssetPicon *item;
-       if( get_button_down() && get_buttonpress() == 3 &&
+       int folder = mwindow->edl->session->awindow_folder;
+       if( get_button_down() && get_buttonpress() == RIGHT_BUTTON &&
            (item = (AssetPicon*)get_selection(0, 0)) ) {
-               int folder = mwindow->edl->session->awindow_folder;
                switch( folder ) {
                case AW_AEFFECT_FOLDER:
                case AW_VEFFECT_FOLDER:
@@ -2497,86 +2685,32 @@ int AWindowAssets::selection_changed()
                deactivate_selection();
        }
        else if( gui->vicon_drawing && get_button_down() &&
-                ( get_buttonpress() == 1 || get_buttonpress() == 2 ) &&
-                ( mwindow->edl->session->awindow_folder == AW_MEDIA_FOLDER ||
-                  mwindow->edl->session->awindow_folder == AW_PROXY_FOLDER ||
-                  mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) &&
-                  (item = (AssetPicon*)get_selection(0, 0)) != 0 ) {
-               VIcon *vicon = 0;
-               if( !gui->vicon_thread->vicon  ) {
-                       vicon = item->vicon;
-               }
-               if( vicon && get_buttonpress() == 2 ) {
-                       vicon->playing_audio = -1;
-                       draw_func = AWindowAssets::draw_vframe;
-               }
-               else
-                       draw_func = 0;
-               gui->vicon_thread->set_view_popup(vicon, draw_func);
-       }
-       return 1;
-}
-
-void AWindowAssets::draw_vframe(BC_WindowBase *wdw, VFrame *vframe) 
-{
-       int y1 = VIEW_POPUP_BAR_H;
-       int y2 = wdw->get_h()-VIEW_POPUP_BAR_H;
-       wdw->set_color(BLACK);
-       wdw->draw_box(0,0,wdw->get_w(),wdw->get_h());
-       wdw->draw_vframe(vframe, 0,y1, wdw->get_w(),y2-y1);
-       ViewPopup *view_popup = (ViewPopup *)wdw;
-       VIconThread *vt = view_popup->vt;
-       AssetVIcon *vicon = (AssetVIcon *)vt->vicon;
-       AssetPicon *picon = (AssetPicon *)vicon->picon;
-       Indexable *idxbl =
-               picon->indexable ? picon->indexable :
-               picon->edl ? picon->edl : 0;
-       if( !idxbl ) return;
-       double sample_rate = idxbl->get_sample_rate();
-       double audio_length = sample_rate > 0 && idxbl->have_audio() ?
-               idxbl->get_audio_samples() / sample_rate : 0;
-       double frame_rate = idxbl->get_frame_rate();
-       double video_length = frame_rate > 0 && idxbl->have_video() ?
-               idxbl->get_video_frames() / frame_rate : 0;
-       double idxbl_length = bmax(audio_length, video_length);
-       if( !idxbl_length ) idxbl_length = 1;
-
-       EDL *edl = picon->mwindow->edl;
-       double total_length = edl->tracks->total_length();
-       if( !total_length ) total_length = 1;
-       for( Track *track=edl->tracks->first; track!=0; track=track->next ) {
-               for( Edit *edit=track->edits->first; edit!=0; edit=edit->next ) {
-                       Indexable *indexable = (Indexable *)edit->asset;
-                       if( !indexable ) indexable = (Indexable *)edit->nested_edl;
-                       if( !indexable ) continue;
-                       if( indexable->id == idxbl->id ||
-                           (!indexable->is_asset == !idxbl->is_asset &&
-                            !strcmp(indexable->path, idxbl->path)) ) {
-                               double pos1 = track->from_units(edit->startsource);
-                               double pos2 = track->from_units(edit->startsource + edit->length);
-                               double xscale = wdw->get_w() / idxbl_length;
-                               int ex1 = pos1 * xscale, ex2 = pos2 * xscale;
-                               wdw->set_color(WHITE);
-                               wdw->draw_box(ex1,0, ex2-ex1,y1);
-                               wdw->set_color(BLACK);
-                               wdw->draw_line(ex1,0, ex1,y1);
-                               wdw->draw_line(ex2,0, ex2,y1);
-                               pos1 = track->from_units(edit->startproject);
-                               pos2 = track->from_units(edit->startproject + edit->length);
-                               xscale = wdw->get_w() / total_length;
-                               int px1 = pos1 * xscale, px2 = pos2 * xscale;
-                               wdw->set_color(RED);
-                               wdw->draw_box(px1,y2, px2-px1,wdw->get_h()-y2);
-                               wdw->set_color(BLACK);
-                               wdw->draw_line(px1,y2, px1,wdw->get_h()-1);
-                               wdw->draw_line(px2,y2, px2,wdw->get_h()-1);
-
-                               wdw->set_color(YELLOW);
-                               wdw->draw_line(ex1,y1, px1,y2);
-                               wdw->draw_line(ex2,y1, px2,y2);
+               (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);
                        }
+                       break;
                }
        }
+       return 1;
 }
 
 void AWindowAssets::draw_background()
@@ -2757,21 +2891,6 @@ int AWindowAssets::focus_out_event()
        return BC_ListBox::focus_out_event();
 }
 
-int AWindowAssets::cursor_enter_event()
-{
-       int ret = BC_ListBox::cursor_enter_event();
-       gui->start_vicon_drawing();
-       return ret;
-}
-
-int AWindowAssets::cursor_leave_event()
-{
-       VIcon *vicon = gui->vicon_thread->vicon;
-       if( vicon && vicon->playing_audio >= 0 )
-               gui->stop_vicon_drawing();
-       return BC_ListBox::cursor_leave_event();
-}
-
 void AWindowAssets::update_vicon_area()
 {
        int x0 = 0, x1 = get_w();
@@ -2789,11 +2908,7 @@ 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];
-               VIcon *vicon = picon->vicon;
-               if( gui->vicon_thread->vicon &&
-                   gui->vicon_thread->vicon->playing_audio < 0 )
-                       vicon->playing_audio = -1;
-               picon->gui->vicon_thread->set_view_popup(vicon, draw_func);
+               gui->vicon_thread->set_view_popup(picon->vicon);
        }
        return 0;
 }