Commit 1c17d1d5 authored by a1ex's avatar a1ex
Browse files

Disabled "set on halfshutter"; some cleanup in movtweaks

--HG--
branch : unified
parent daa054e6618f
...@@ -91,7 +91,7 @@ extern struct gui_timer_struct gui_timer_struct; ...@@ -91,7 +91,7 @@ extern struct gui_timer_struct gui_timer_struct;
extern void* gui_main_task_functbl; extern void* gui_main_task_functbl;
CONFIG_INT("set.on.halfshutter", set_on_halfshutter, 0); //~ CONFIG_INT("set.on.halfshutter", set_on_halfshutter, 0);
// return 0 if you want to block this event // return 0 if you want to block this event
static int handle_buttons(struct event * event) static int handle_buttons(struct event * event)
...@@ -253,11 +253,11 @@ static int handle_buttons(struct event * event) ...@@ -253,11 +253,11 @@ static int handle_buttons(struct event * event)
} }
// force a SET press in photo mode when you adjust the settings and press half-shutter // force a SET press in photo mode when you adjust the settings and press half-shutter
if (set_on_halfshutter && event->type == 0 && event->param == BGMT_PRESS_HALFSHUTTER && gui_state == GUISTATE_PLAYMENU && !lv && !gui_menu_shown()) /*if (set_on_halfshutter && event->type == 0 && event->param == BGMT_PRESS_HALFSHUTTER && gui_state == GUISTATE_PLAYMENU && !lv && !gui_menu_shown())
{ {
fake_simple_button(BGMT_PRESS_SET); fake_simple_button(BGMT_PRESS_SET);
fake_simple_button(BGMT_UNPRESS_SET); fake_simple_button(BGMT_UNPRESS_SET);
} }*/
// for faster zoom in in Play mode // for faster zoom in in Play mode
if (event->type == 0) if (event->type == 0)
......
...@@ -120,7 +120,7 @@ void do_movie_mode_remap() ...@@ -120,7 +120,7 @@ void do_movie_mode_remap()
else if (shooting_mode == SHOOTMODE_MOVIE) set_shooting_mode(movie_newmode); else if (shooting_mode == SHOOTMODE_MOVIE) set_shooting_mode(movie_newmode);
mode_remap_done = 1; mode_remap_done = 1;
} }
/*
CONFIG_INT("dof.adjust", dof_adjust, 1); CONFIG_INT("dof.adjust", dof_adjust, 1);
int get_dof_adjust() { return dof_adjust; } int get_dof_adjust() { return dof_adjust; }
...@@ -171,7 +171,7 @@ static void aperiso_open(void* priv) ...@@ -171,7 +171,7 @@ static void aperiso_open(void* priv)
aperiso_rawiso -= 4; aperiso_rawiso -= 4;
lens_set_rawaperture(aperiso_rawap); lens_set_rawaperture(aperiso_rawap);
lens_set_rawiso(aperiso_rawiso); lens_set_rawiso(aperiso_rawiso);
} }*/
static void static void
mode_remap_print( mode_remap_print(
......
...@@ -370,7 +370,7 @@ qrplay_display( ...@@ -370,7 +370,7 @@ qrplay_display(
quick_review_allow_zoom ? "Hold->Play" : "QuickReview" quick_review_allow_zoom ? "Hold->Play" : "QuickReview"
); );
} }
/*
extern int set_on_halfshutter; extern int set_on_halfshutter;
static void static void
...@@ -387,7 +387,7 @@ set_on_halfshutter_display( ...@@ -387,7 +387,7 @@ set_on_halfshutter_display(
"HalfShutter in DLGs : %s", "HalfShutter in DLGs : %s",
set_on_halfshutter ? "SET" : "Cancel" set_on_halfshutter ? "SET" : "Cancel"
); );
} }*/
extern int iso_round_only; extern int iso_round_only;
static void static void
...@@ -484,7 +484,7 @@ struct menu_entry tweak_menus[] = { ...@@ -484,7 +484,7 @@ struct menu_entry tweak_menus[] = {
.display = quickzoom_display, .display = quickzoom_display,
.help = "Faster zoom in Play mode, for pixel peeping :)" .help = "Faster zoom in Play mode, for pixel peeping :)"
}, },
#ifdef CONFIG_550D #if 0
{ {
.name = "HalfShutter in DLGs", .name = "HalfShutter in DLGs",
.priv = &set_on_halfshutter, .priv = &set_on_halfshutter,
......
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