Andrew rates additions

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

diff --git a/cinelerra-5.1/cinelerra/theme.C b/cinelerra-5.1/cinelerra/theme.C
index 1700a5b371ea91257d4ae738d381aeb4174ef283..0c364f73d35fd86238312f06ef1ac00c33c9af27 100644 (file)
--- a/cinelerra-5.1/cinelerra/theme.C
+++ b/cinelerra-5.1/cinelerra/theme.C
@@ -24,6 +24,7 @@
 #include "clip.h"
 #include "bccolors.h"
 #include "cwindowgui.h"
+#include "edit.h"
 #include "edl.h"
 #include "edlsession.h"
 #include "keyframegui.h"
@@ -46,6 +47,7 @@
 #include "resourcepixmap.h"
 #include "statusbar.h"
 #include "theme.h"
+#include "track.h"
 #include "timebar.h"
 #include "trackcanvas.h"
 #include "vframe.h"
@@ -177,6 +179,7 @@ Theme::Theme()
        statusbar_cancel_data = 0;
        timebar_view_data = 0;
        transition_data = 0;
+       tumblepatch_data = 0;
        uptriangle_data = 0;
        viewasset_data = 0;
        vtimebar_bg_data = 0;
@@ -271,6 +274,7 @@ void Theme::build_menus()
        aspect_ratios.append(new BC_ListBoxItem("3:2"));
        aspect_ratios.append(new BC_ListBoxItem("4:3"));
        aspect_ratios.append(new BC_ListBoxItem("16:9"));
+       aspect_ratios.append(new BC_ListBoxItem("16:10"));
        aspect_ratios.append(new BC_ListBoxItem("2.10:1"));
        aspect_ratios.append(new BC_ListBoxItem("2.20:1"));
        aspect_ratios.append(new BC_ListBoxItem("2.25:1"));
@@ -280,9 +284,12 @@ void Theme::build_menus()
 
        frame_sizes.append(new BC_ListBoxItem("128x96     "));
        frame_sizes.append(new BC_ListBoxItem("160x120    "));
+       frame_sizes.append(new BC_ListBoxItem("240x160   HQVGA"));
        frame_sizes.append(new BC_ListBoxItem("320x240    "));
+       frame_sizes.append(new BC_ListBoxItem("352x288    "));
        frame_sizes.append(new BC_ListBoxItem("360x240    "));
-       frame_sizes.append(new BC_ListBoxItem("400x300    "));
+       frame_sizes.append(new BC_ListBoxItem("384x288    CIF"));
+       frame_sizes.append(new BC_ListBoxItem("400x300    qSVGA"));
        frame_sizes.append(new BC_ListBoxItem("640x360    nHD"));
        frame_sizes.append(new BC_ListBoxItem("640x400    "));
        frame_sizes.append(new BC_ListBoxItem("640x480    VGA"));
@@ -296,19 +303,32 @@ void Theme::build_menus()
        frame_sizes.append(new BC_ListBoxItem("1024x576   "));
        frame_sizes.append(new BC_ListBoxItem("1024x768   XGA"));
        frame_sizes.append(new BC_ListBoxItem("1152x648   "));
+       frame_sizes.append(new BC_ListBoxItem("1152x768   "));
+       frame_sizes.append(new BC_ListBoxItem("1152x864  XGA+"));
        frame_sizes.append(new BC_ListBoxItem("1280x720   HD"));
+       frame_sizes.append(new BC_ListBoxItem("1280x800   "));
        frame_sizes.append(new BC_ListBoxItem("1280x1024  SXGA"));
        frame_sizes.append(new BC_ListBoxItem("1366x768   WXGA"));
+       frame_sizes.append(new BC_ListBoxItem("1440x900   WXGA+"));
+       frame_sizes.append(new BC_ListBoxItem("1440x1080  HDV"));
        frame_sizes.append(new BC_ListBoxItem("1600x900   HD+"));
        frame_sizes.append(new BC_ListBoxItem("1600x1200  UXGA"));
        frame_sizes.append(new BC_ListBoxItem("1920x1080  Full HD"));
+       frame_sizes.append(new BC_ListBoxItem("1920x1280  FHD+"));
+       frame_sizes.append(new BC_ListBoxItem("2048x1080  DCI 2K"));
        frame_sizes.append(new BC_ListBoxItem("2048x1152  "));
+       frame_sizes.append(new BC_ListBoxItem("2048x1536   QXGA"));
+       frame_sizes.append(new BC_ListBoxItem("2160x1440   "));
        frame_sizes.append(new BC_ListBoxItem("2304x1296  "));
-       frame_sizes.append(new BC_ListBoxItem("2560x1440  QHD"));
+       frame_sizes.append(new BC_ListBoxItem("2560x1080  UW-FHD"));
+       frame_sizes.append(new BC_ListBoxItem("2560x1440  WQHD"));
        frame_sizes.append(new BC_ListBoxItem("2880x1620  "));
-       frame_sizes.append(new BC_ListBoxItem("3200x1800  QHD+"));
+       frame_sizes.append(new BC_ListBoxItem("3200x1800  WQXGA+"));
+       frame_sizes.append(new BC_ListBoxItem("3440x1440  Ultra-Wide QHD"));
        frame_sizes.append(new BC_ListBoxItem("3520x1980  "));
+       frame_sizes.append(new BC_ListBoxItem("3840x1600  UW4K"));
        frame_sizes.append(new BC_ListBoxItem("3840x2160  4K UHD"));
+       frame_sizes.append(new BC_ListBoxItem("4096x2160  DCI 4K"));
        frame_sizes.append(new BC_ListBoxItem("4096x2304  Full 4K UHD"));
        frame_sizes.append(new BC_ListBoxItem("4480x2520  "));
        frame_sizes.append(new BC_ListBoxItem("5120x2880  5K UHD"));
@@ -318,12 +338,15 @@ void Theme::build_menus()
        frame_sizes.append(new BC_ListBoxItem("7680x4320  8K UHD"));
 
        sample_rates.append(new BC_ListBoxItem("8000"));
+       sample_rates.append(new BC_ListBoxItem("11025"));
        sample_rates.append(new BC_ListBoxItem("16000"));
        sample_rates.append(new BC_ListBoxItem("22050"));
        sample_rates.append(new BC_ListBoxItem("32000"));
        sample_rates.append(new BC_ListBoxItem("44100"));
        sample_rates.append(new BC_ListBoxItem("48000"));
+       sample_rates.append(new BC_ListBoxItem("88000"));
        sample_rates.append(new BC_ListBoxItem("96000"));
+       sample_rates.append(new BC_ListBoxItem("176400"));
        sample_rates.append(new BC_ListBoxItem("192000"));
 
        frame_rates.append(new BC_ListBoxItem("0.25"));
@@ -340,8 +363,12 @@ void Theme::build_menus()
        frame_rates.append(new BC_ListBoxItem("50"));
        frame_rates.append(new BC_ListBoxItem("59.94"));
        frame_rates.append(new BC_ListBoxItem("60"));
+       frame_rates.append(new BC_ListBoxItem("72"));
+       frame_rates.append(new BC_ListBoxItem("85"));
+       frame_rates.append(new BC_ListBoxItem("90"));
        frame_rates.append(new BC_ListBoxItem("100"));
        frame_rates.append(new BC_ListBoxItem("120"));
+       frame_rates.append(new BC_ListBoxItem("144"));
        frame_rates.append(new BC_ListBoxItem("1000"));
 
        char string[BCTEXTLEN];
@@ -871,12 +898,13 @@ void Theme::draw_rwindow_bg(RecordGUI *gui)
 }
 
 
-void Theme::draw_resource_bg(TrackCanvas *canvas, ResourcePixmap *pixmap, int color,
-       int edit_x, int edit_w, int pixmap_x, int x1, int y1, int x2, int y2)
+void Theme::draw_resource_bg(TrackCanvas *canvas, ResourcePixmap *pixmap,
+               int color, Edit *edit, int edit_x, int edit_w,
+               int pixmap_x, int x1, int y1, int x2, int y2)
 {
        VFrame *image = 0;
-
-       switch(mwindow->edl->local_session->zoom_track) {
+       int data_h = edit->track->data_h;
+       switch( data_h ) {
                case 1024: image = get_image("resource1024");  break;
                case 512: image = get_image("resource512");  break;
                case 256: image = get_image("resource256");  break;