add x10tv ati remote rework, android remote rework, wintv remote tweaks

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

diff --git a/cinelerra-5.1/cinelerra/awindowgui.C b/cinelerra-5.1/cinelerra/awindowgui.C
index 03c8f22132266cb337352178e5910869503436cb..cabbbc06fb1c86eda270c8bfed0c13ccb83a2027 100644 (file)
--- a/cinelerra-5.1/cinelerra/awindowgui.C
+++ b/cinelerra-5.1/cinelerra/awindowgui.C
@@ -120,7 +120,8 @@ AssetVIcon::~AssetVIcon()
 VFrame *AssetVIcon::frame()
 {
        AssetVIconThread *avt = picon->gui->vicon_thread;
-       Asset *asset = (Asset *)picon->indexable;
+       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);
@@ -1304,6 +1305,7 @@ AWindowGUI::AWindowGUI(MWindow *mwindow, AWindow *awindow)
        vicon_audio = 0;
        vicon_drawing = AVICON_FULL_PLAY;
        play_off = 0;
+       tip_info = 0;
        displayed_folder = AW_NO_FOLDER;
        new_folder_thread = 0;
        modify_folder_thread = 0;
@@ -1898,7 +1900,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");
@@ -2066,6 +2068,10 @@ void AWindowGUI::update_asset_list()
                if( !exists ) {
                        AssetPicon *picon = new AssetPicon(mwindow,
                                this, current);
+                       if( current->format == FILE_REF ) {
+                               int color = picon->get_color();
+                               picon->set_color(color ^ 0x5599CC);
+                       }
                        new_assets.append(picon);
                }
        }