rework android-rmt display, add a few buttons

[goodguy/history.git] / cinelerra-5.0 / cinelerra / mbuttons.C

diff --git a/cinelerra-5.0/cinelerra/mbuttons.C b/cinelerra-5.0/cinelerra/mbuttons.C
index d2836607b06d1d74ce58765268ae3e8c55dda8e6..ab9e27fe7893e29740ae9a4e08070ec7eb5bd65e 100644 (file)
--- a/cinelerra-5.0/cinelerra/mbuttons.C
+++ b/cinelerra-5.0/cinelerra/mbuttons.C
@@ -71,7 +71,7 @@ void MButtons::create_objects()
        edit_panel->create_objects();
        
        x += edit_panel->get_w();
-       ffmpeg_toggle = new MainFFMpegToggle(mwindow, this, get_w()-30, 0);
+       ffmpeg_toggle = new MainFFMpegToggle(mwindow, this, get_w(), 0);
        add_subwindow(ffmpeg_toggle);
        flash(0);
 }
@@ -83,6 +83,7 @@ int MButtons::resize_event()
                mwindow->theme->mbuttons_w, 
                mwindow->theme->mbuttons_h);
        draw_top_background(get_parent(), 0, 0, get_w(), get_h());
+       ffmpeg_toggle->reposition_window(get_w()-30, 0);
        flash(0);
        return 0;
 }
@@ -169,23 +170,9 @@ MainEditing::MainEditing(MWindow *mwindow, MButtons *mbuttons, int x, int y)
 }
 
 
-#include "data/ff_checked_png.h"
-#include "data/ff_down_png.h"
-#include "data/ff_checkedhi_png.h"
-#include "data/ff_up_png.h"
-#include "data/ff_hi_png.h"
-
-static VFrame *ff_images[] = {
-       new VFrame(ff_up_png),
-       new VFrame(ff_hi_png),
-       new VFrame(ff_checked_png),
-       new VFrame(ff_down_png),
-       new VFrame(ff_checkedhi_png)
-};
-
 MainFFMpegToggle::MainFFMpegToggle(MWindow *mwindow, MButtons *mbuttons, int x, int y)
- : BC_Toggle(x - ff_images[0]->get_w(), y, &ff_images[0],
-               mwindow->preferences->ffmpeg_early_probe)
+ : BC_Toggle(x - mwindow->theme->ffmpeg_toggle[0]->get_w(), y,
+       mwindow->theme->ffmpeg_toggle, mwindow->preferences->ffmpeg_early_probe)
 {
        this->mwindow = mwindow;
        this->mbuttons = mbuttons;