Read about our upcoming Code of Conduct on this issue

Commit f022f36b authored by a1ex's avatar a1ex
Browse files

Enabled zebra, shoot, movtweaks; disabled some tricky code.

--HG--
branch : unified
parent 22757062dfef
......@@ -11,11 +11,6 @@
#include "gui.h"
#include "lens.h"
#ifdef CONFIG_600D
#include "disable-this-module.h"
#endif
CONFIG_INT("hdmi.force.vga", hdmi_force_vga, 0);
// WB workaround (not saved in movie mode)
......
......@@ -91,7 +91,7 @@ extern struct gui_timer_struct gui_timer_struct;
extern void* gui_main_task_functbl;
CONFIG_INT("set.on.halfshutter", set_on_halfshutter, 1);
CONFIG_INT("set.on.halfshutter", set_on_halfshutter, 0);
// return 0 if you want to block this event
static int handle_buttons(struct event * event)
......
......@@ -221,8 +221,10 @@
#define DLG_Q_UNAVI 0x1F
#define DLG_FLASH_AE 0x22
#define DLG_PICQ 6
#define DLG_MOVIE_ENSURE_A_LENS_IS_ATTACHED 0x1A
#define DLG_MOVIE_PRESS_LV_TO_RESUME 0x1B
//~ #define DLG_MOVIE_ENSURE_A_LENS_IS_ATTACHED (CURRENT_DIALOG_MAYBE == 0x1A)
//~ #define DLG_MOVIE_PRESS_LV_TO_RESUME (CURRENT_DIALOG_MAYBE == 0x1B)
#define DLG_MOVIE_ENSURE_A_LENS_IS_ATTACHED 0 // not good
#define DLG_MOVIE_PRESS_LV_TO_RESUME 0
#define PLAY_MODE (gui_state == GUISTATE_PLAYMENU && CURRENT_DIALOG_MAYBE == DLG_PLAY)
#define MENU_MODE (gui_state == GUISTATE_PLAYMENU && CURRENT_DIALOG_MAYBE == DLG_MENU)
......
......@@ -113,6 +113,7 @@ static int handle_buttons(struct event * event) {
output = 0;
}
break;
case BGMT_Q:
case BGMT_Q_ALT:
if(gui_menu_shown())
{
......@@ -122,10 +123,6 @@ static int handle_buttons(struct event * event) {
case BGMT_ZOOM_OUT :
// Do nothing for now
break;
case BGMT_Q :
// Causes certain buttons to not be triggered (known examples are LEFT/RIGHT) under "Q" mode
// Do nothing for now
break;
case BGMT_MOVIE_SHOOTING :
// Do nothing for now
break;
......
......@@ -32,10 +32,6 @@
#include "lens.h"
#include "gui.h"
#ifdef CONFIG_600D
#include "disable-this-module.h"
#endif
void move_lv_afframe(int dx, int dy);
void movie_start();
void movie_end();
......@@ -2581,7 +2577,7 @@ shoot_task( void* unused )
menu_add( "Expo", expo_menus, COUNT(expo_menus) );
msleep(1000);
menu_add( "Tweak", vid_menus, COUNT(vid_menus) );
// :-)
struct tm now;
LoadCalendarFromRTC( &now );
......@@ -2632,6 +2628,7 @@ shoot_task( void* unused )
movie_end_flag = 0;
}
#ifndef CONFIG_600D
if (!lv) // MLU
{
if (mlu_mode == 0 && get_mlu()) set_mlu(0);
......@@ -2648,6 +2645,7 @@ shoot_task( void* unused )
}
}
}
#endif
if (lv && face_zoom_request && lv_dispsize == 1 && !recording)
{
......
......@@ -32,10 +32,6 @@
#include "gui.h"
#include "lens.h"
#ifdef CONFIG_600D
#include "disable-this-module.h"
#endif
void waveform_init();
void histo_init();
void do_disp_mode_change();
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment