tool tipinfo on effect plugins, updated plugin tipinfo, tweaks to layouts
[goodguy/cinelerra.git] / cinelerra-5.1 / cinelerra / awindowgui.C
index 2e02562c19ba4840370471df11ec1859d0a23eda..e2340d1e4a601c11ef499c79f8b0a7fd339bba93 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"
@@ -94,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")
@@ -111,9 +119,11 @@ AssetVIcon::~AssetVIcon()
 
 VFrame *AssetVIcon::frame()
 {
+       AssetVIconThread *avt = picon->gui->vicon_thread;
        Asset *asset = (Asset *)picon->indexable;
+       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, 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,13 +144,12 @@ 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 vw = picon->gui->vicon_thread->vw;
-       int vh = picon->gui->vicon_thread->vh;
+       int vw = avt->vw, vh = avt->vh, vicon_cmodel = avt->vicon_cmodel;
        if( !asset->video_data ) {
                if( !temp ) {
                        temp = new VFrame(0, -1, vw, vh, BC_RGB888, -1);
@@ -166,7 +175,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, vw, vh, BC_RGB8);
+                       add_image(temp, vw, vh, vicon_cmodel);
                }
                mwindow->video_cache->check_in(asset);
        }
@@ -274,7 +283,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();
 }
@@ -302,47 +313,64 @@ 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,
-               VFrame *frame, int x, int y, int w, int h)
- : ViewPopup(vt, frame, x, y, w, h)
+               int x, int y, int w, int h)
+ : ViewPopup(vt, x, y, w, h)
 {
        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;
 
-       int dir = 1, button = get_buttonpress();
-       switch( button ) {
-       case WHEEL_DOWN: dir = -1; // fall thru
-       case WHEEL_UP:   return zoom_scale(dir);
+       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
+       case WHEEL_UP:
+               switch( draw_mode ) {
+               case ASSET_VIEW_MEDIA:
+               case ASSET_VIEW_MEDIA_MAP:
+                       avt->zoom_scale(dir);
+                       return 1;
+               } // fall thru
        default:
                return 0;
        }
 
-       if( draw_mode != ASSET_DRAW_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;
        dragging = 0;
-       if( y < bar_h ) {
+       if( y < get_h()/2 ) {
                Indexable *idxbl =
                        picon->indexable ? picon->indexable :
                        picon->edl ? picon->edl : 0;
@@ -383,13 +411,15 @@ 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;
        }
-       if( y >= get_h()-bar_h ) {
+       else {
                dragging = 1;
-               if( !ctrl_down() )
+               if( !ctrl_down() && !shift_down() )
                        return cursor_motion_event();
                Indexable *idxbl =
                        picon->indexable ? picon->indexable :
@@ -418,11 +448,9 @@ int AssetViewPopup::button_press_event()
                        }
                }
                mwindow->gui->lock_window("AssetVIcon::popup_button_press");
-               edl->local_session->set_selectionstart(pos);
-               edl->local_session->set_selectionend(pos);
-               mwindow->find_cursor();
+               mwindow->select_point(start);
                edl->local_session->set_selectionstart(start);
-               edl->local_session->set_selectionend(end);
+               edl->local_session->set_selectionend(!shift_down() ? start : end);
                mwindow->zoom_sample(edl->local_session->zoom_sample);
                mwindow->gui->unlock_window();
                return 1;
@@ -439,38 +467,44 @@ 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_DRAW_MEDIA_MAP ) return 0;
-       if( !get_button_down() || get_buttonpress() != 1 ||
-           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;
 }
 
 void AssetViewPopup::draw_vframe(VFrame *vframe) 
 {
-       if( draw_mode == ASSET_DRAW_IMAGE ) {
+       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:
+       case ASSET_VIEW_FULL:
+               break;
        }
        set_color(BLACK);
        draw_box(0,0,get_w(),get_h());
-       if( draw_mode != ASSET_DRAW_MEDIA_MAP )
-               return;
        int y1 = bar_h;
        int y2 = get_h()-bar_h;
        BC_WindowBase::draw_vframe(vframe, 0,y1, get_w(),y2-y1);
@@ -494,6 +528,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;
@@ -528,45 +563,123 @@ 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:
+               switch( get_keypress() ) {
+               case 'f':
+               case 'F':
+                       avt->draw_mode = ASSET_VIEW_FULL;
+                       result = 1;
+               }
+               break;
+       case ASSET_VIEW_FULL:
+               avt->draw_mode = ASSET_VIEW_MEDIA_MAP;
+               result = 1;
+       }
+       if( result ) // zero change for refresh
+               avt->zoom_scale(0);
+       return ViewPopup::keypress_event();
+}
+
 
-AssetVIconThread::AssetVIconThread(AWindowAssets *asset_list)
- : VIconThread(asset_list,
-       asset_list->mwindow->preferences->awindow_picon_h * 16/9,
-       asset_list->mwindow->preferences->awindow_picon_h,
-       4 * asset_list->mwindow->preferences->awindow_picon_h * 16/9,
-       4 * asset_list->mwindow->preferences->awindow_picon_h)
+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)
 {
-       draw_mode = ASSET_DRAW_IMAGE;
+       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;
+       this->draw_lock = new Mutex("AssetVIconThread::draw_lock");
 }
 
 AssetVIconThread::~AssetVIconThread()
 {
+       delete draw_lock;
 }
 
-void AssetVIconThread::set_view_popup(AssetVIcon *vicon, int draw_mode)
+void AssetVIconThread::drawing_started()
 {
-       if( draw_mode >= 0 )
-               this->draw_mode = draw_mode;
-       VIconThread::set_view_popup(vicon);
+       draw_lock->lock("AssetVIconThread::drawing_started");
 }
 
-ViewPopup *AssetVIconThread::new_view_window(VFrame *frame)
+void AssetVIconThread::drawing_stopped()
+{
+       draw_lock->unlock();
+}
+
+void AssetVIconThread::set_view_popup(AssetVIcon *v, int draw_mode)
+{
+       gui->stop_vicon_drawing();
+       this->draw_mode = draw_mode;
+       set_view_popup(v);
+       gui->start_vicon_drawing();
+}
+
+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();
-       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->vw);
-       ry += (ry >= cy ? -view_h : viewing->vh);
-       AssetViewPopup *popup = new AssetViewPopup(this, draw_mode,
-               frame, rx, ry, view_w, view_h);
-       if( draw_mode == ASSET_DRAW_MEDIA_MAP )
-               vicon->playing_audio = -1;
-       wdw->set_active_subwindow(popup);
-       return popup;
+       int rx = 0, ry = 0, rw = 0, rh = 0;
+       if( draw_mode != ASSET_VIEW_FULL ) {
+               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(), vy = viewing->get_vy();
+               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);
+               rw = view_w;  rh = view_h;
+       }
+       else
+               parent->get_fullscreen_geometry(rx, ry, rw, rh);
+       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()
+{
+       stop_drawing();
+       drawing_started(); // waits for draw lock
+       drawing_stopped();
 }
 
 
@@ -756,6 +869,9 @@ void AssetPicon::reset()
        vicon_frame = 0;
        in_use = 1;
        comments_time = 0;
+       comments_rate = -1;
+       comments_ffmt = ' ';
+       comments_type = "";
        id = 0;
        persistent = 0;
 }
@@ -796,17 +912,26 @@ void AssetPicon::create_objects()
        int picon_h = mwindow->preferences->awindow_picon_h;
        pixmap_h = picon_h * BC_WindowBase::get_resources()->icon_scale;
 
-       if( indexable ) {
+       Asset *asset = 0;
+       EDL *edl = 0;
+       int is_clip = 0;
+
+       if( this->indexable ) {
                fs.extract_name(name, indexable->path);
                set_text(name);
+               if( this->indexable->is_asset )
+                       asset = (Asset *)indexable;
+               else
+                       edl = (EDL *)indexable;
        }
-       else if( edl ) {
+       else if( this->edl ) {
+               edl = this->edl;
                set_text(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();
@@ -848,7 +973,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;
@@ -866,27 +992,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;
@@ -949,6 +1057,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;
@@ -962,43 +1071,35 @@ 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();
+                               AssetVIconThread *avt = gui->vicon_thread;
                                char clip_icon_path[BCTEXTLEN];
                                char *clip_icon = edl->local_session->clip_icon;
-                               if( clip_icon[0] ) {
+                               VFrame *vframe = 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);
+                                       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");
@@ -1007,24 +1108,30 @@ 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( this->edl && 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,
                                        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() ) {
@@ -1032,7 +1139,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);
@@ -1068,7 +1175,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();
@@ -1078,14 +1186,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();
@@ -1124,8 +1235,7 @@ void AssetPicon::create_objects()
                        }
                }
        }
-       else
-       if( label ) {
+       else if( label ) {
                Units::totext(name,
                              label->position,
                              mwindow->edl->session->time_format,
@@ -1159,14 +1269,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;
@@ -1200,7 +1302,8 @@ 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;
        displayed_folder = AW_NO_FOLDER;
        new_folder_thread = 0;
        modify_folder_thread = 0;
@@ -1385,7 +1488,7 @@ void AWindowGUI::create_objects()
        y1 += dy;  h1 -= dy;
        add_subwindow(asset_list = new AWindowAssets(mwindow, this, x1, y1, w1, h1));
 
-       vicon_thread = new AssetVIconThread(asset_list);
+       vicon_thread = new AssetVIconThread(this, mwindow->preferences);
        asset_list->update_vicon_area();
        vicon_thread->start();
        vicon_audio = new AssetVIconAudio(this);
@@ -1398,9 +1501,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(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();
@@ -1498,7 +1608,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);
 }
@@ -1507,6 +1617,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;
 }
 
@@ -1514,6 +1625,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;
 }
 
@@ -1533,11 +1645,23 @@ 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 ||
            mwindow->edl->session->awindow_folder >= AWINDOW_USER_FOLDERS ) {
                switch( mwindow->edl->session->assetlist_format ) {
                case ASSETS_ICONS:
@@ -1550,12 +1674,19 @@ 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()
+{
+       vicon_thread->close_view_popup();
 }
 
 VFrame *AssetPicon::get_vicon_frame()
@@ -1565,7 +1696,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;
 }
@@ -1598,6 +1729,12 @@ 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)
@@ -1727,6 +1864,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();
@@ -1970,9 +2111,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);
                }
        }
 }
@@ -2158,9 +2303,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
@@ -2420,7 +2567,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();
                }
@@ -2436,20 +2583,7 @@ int AWindowFolders::selection_changed()
 
 int AWindowFolders::button_press_event()
 {
-       AssetVIconThread *avt = gui->vicon_thread;
-       if(  gui->asset_list->is_event_win() &&
-            avt->viewing && avt->view_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) )
-                               return avt->view_win->zoom_scale(dir);
-                       break; }
-               }
-       }
-
+       gui->hide_tip_info();
        int result = BC_ListBox::button_press_event();
 
        if( !result ) {
@@ -2461,7 +2595,6 @@ int AWindowFolders::button_press_event()
                }
        }
 
-
        return result;
 }
 
@@ -2572,6 +2705,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);
 }
@@ -2582,11 +2716,24 @@ AWindowAssets::~AWindowAssets()
 
 int AWindowAssets::button_press_event()
 {
-       int result = 0;
+       hide_tip_info();
+       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 )
+                               avt->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 ) {
@@ -2658,9 +2805,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:
@@ -2692,19 +2839,43 @@ 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 ) {
-               AssetVIcon *vicon = 0;
-               if( !gui->vicon_thread->vicon  ) {
-                       vicon = item->vicon;
+       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;
+                       }
+               }
+               else {
+                       gui->vicon_thread->set_view_popup(0);
+                       if( gui->vicon_drawing != AVICON_FULL_PLAY )
+                               gui->stop_vicon_drawing();
                }
-               int draw_mode = vicon && get_buttonpress() == 2 ?
-                       ASSET_DRAW_MEDIA_MAP : ASSET_DRAW_IMAGE;
-               gui->vicon_thread->set_view_popup(vicon, draw_mode);
        }
        return 1;
 }
@@ -2722,6 +2893,7 @@ void AWindowAssets::draw_background()
 
 int AWindowAssets::drag_start_event()
 {
+       gui->vicon_thread->set_view_popup(0);
        int collect_pluginservers = 0;
        int collect_assets = 0, proxy = 0;
 
@@ -2874,16 +3046,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();
 }
 
@@ -2901,12 +3092,51 @@ 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)
+{
+       show_tooltip(info);
+       info_tip = no;
+}
+
+void AWindowAssets::hide_tip_info()
+{
+       hide_tooltip();
+       info_tip = -1;
 }
 
 
@@ -3068,7 +3298,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;
@@ -3139,36 +3369,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')