X-Git-Url: http://git.cinelerra-gg.org/git/?a=blobdiff_plain;ds=sidebyside;f=cinelerra-5.1%2Fcinelerra%2Fresourcethread.h;h=0d165ff5ccf3b6105d78f13715da0e2811bc539e;hb=HEAD;hp=5a87ff436e5c5922bdf6bd12814571572475781d;hpb=30bdb85eb33a8ee7ba675038a86c6be59c43d7bd;p=goodguy%2Fhistory.git diff --git a/cinelerra-5.1/cinelerra/resourcethread.h b/cinelerra-5.1/cinelerra/resourcethread.h index 5a87ff43..0d165ff5 100644 --- a/cinelerra-5.1/cinelerra/resourcethread.h +++ b/cinelerra-5.1/cinelerra/resourcethread.h @@ -2,21 +2,21 @@ /* * CINELERRA * Copyright (C) 2008 Adam Williams - * + * * This program is free software; you can redistribute it and/or modify * it under the terms of the GNU General Public License as published by * the Free Software Foundation; either version 2 of the License, or * (at your option) any later version. - * + * * This program is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * GNU General Public License for more details. - * + * * You should have received a copy of the GNU General Public License * along with this program; if not, write to the Free Software * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA - * + * */ #ifndef RESOURCETHREAD_H @@ -47,7 +47,7 @@ class ResourceThreadItem { public: - ResourceThreadItem(ResourcePixmap *pixmap, + ResourceThreadItem(ResourcePixmap *pixmap, int pane_number, Indexable *indexable, int data_type, @@ -86,8 +86,8 @@ class VResourceThreadItem : public ResourceThreadItem public: VResourceThreadItem(ResourcePixmap *pixmap, int pane_number, - int picon_x, - int picon_y, + int picon_x, + int picon_y, int picon_w, int picon_h, double frame_rate, @@ -98,7 +98,7 @@ public: ~VResourceThreadItem(); - + int picon_x; int picon_y; int picon_w; @@ -121,12 +121,12 @@ public: void stop_draw(int reset); void start_draw(); -// Be sure to stop_draw before changing the asset table, +// Be sure to stop_draw before changing the asset table, // closing files. - void add_picon(ResourcePixmap *pixmap, + void add_picon(ResourcePixmap *pixmap, int pane_number, - int picon_x, - int picon_y, + int picon_x, + int picon_y, int picon_w, int picon_h, double frame_rate, @@ -149,8 +149,8 @@ public: void do_video(VResourceThreadItem *item); void do_audio(AResourceThreadItem *item); - void open_render_engine(EDL *nested_edl, - int do_audio, + void open_render_engine(EDL *nested_edl, + int do_audio, int do_video); File *get_video_source(Asset *asset); @@ -159,7 +159,6 @@ public: MWindow *mwindow; MWindowGUI *gui; Condition *draw_lock; -// Condition *interrupted_lock; Mutex *item_lock; ArrayList items; int interrupted;