projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
83cc718
)
Add arrows to player too.
author
Carl Hetherington
<cth@carlh.net>
Fri, 23 Mar 2018 01:28:13 +0000
(
01:28
+0000)
committer
Carl Hetherington
<cth@carlh.net>
Fri, 23 Mar 2018 01:28:13 +0000
(
01:28
+0000)
src/tools/dcpomatic_player.cc
patch
|
blob
|
history
diff --git
a/src/tools/dcpomatic_player.cc
b/src/tools/dcpomatic_player.cc
index 39826df1b5b1a202c52610cde9c23ebc5821ad25..d7e47081c92d03105f484c247d074af0e44d8eb1 100644
(file)
--- a/
src/tools/dcpomatic_player.cc
+++ b/
src/tools/dcpomatic_player.cc
@@
-84,7
+84,9
@@
enum {
ID_tools_verify,
ID_tools_check_for_updates,
/* IDs for shortcuts (with no associated menu item) */
ID_tools_verify,
ID_tools_check_for_updates,
/* IDs for shortcuts (with no associated menu item) */
- ID_start_stop
+ ID_start_stop,
+ ID_back_frame,
+ ID_forward_frame
};
class DOMFrame : public wxFrame
};
class DOMFrame : public wxFrame
@@
-149,21
+151,25
@@
public:
overall_panel->SetSizer (main_sizer);
#ifdef __WXOSX__
overall_panel->SetSizer (main_sizer);
#ifdef __WXOSX__
- int accelerators =
2
;
+ int accelerators =
4
;
#else
#else
- int accelerators =
1
;
+ int accelerators =
3
;
#endif
wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators];
accel[0].Set(wxACCEL_NORMAL, WXK_SPACE, ID_start_stop);
#endif
wxAcceleratorEntry* accel = new wxAcceleratorEntry[accelerators];
accel[0].Set(wxACCEL_NORMAL, WXK_SPACE, ID_start_stop);
+ accel[1].Set(wxACCEL_NORMAL, WXK_LEFT, ID_back_frame);
+ accel[2].Set(wxACCEL_NORMAL, WXK_RIGHT, ID_forward_frame);
#ifdef __WXOSX__
#ifdef __WXOSX__
- accel[
1
].Set(wxACCEL_CTRL, static_cast<int>('W'), ID_file_close);
+ accel[
3
].Set(wxACCEL_CTRL, static_cast<int>('W'), ID_file_close);
#endif
wxAcceleratorTable accel_table (accelerators, accel);
SetAcceleratorTable (accel_table);
delete[] accel;
Bind (wxEVT_MENU, boost::bind (&DOMFrame::start_stop_pressed, this), ID_start_stop);
#endif
wxAcceleratorTable accel_table (accelerators, accel);
SetAcceleratorTable (accel_table);
delete[] accel;
Bind (wxEVT_MENU, boost::bind (&DOMFrame::start_stop_pressed, this), ID_start_stop);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::back_frame, this), ID_back_frame);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::forward_frame, this), ID_forward_frame);
UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
}
UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
}
@@
-573,6
+579,16
@@
private:
}
}
}
}
+ void back_frame ()
+ {
+ _viewer->back_frame ();
+ }
+
+ void forward_frame ()
+ {
+ _viewer->forward_frame ();
+ }
+
bool _update_news_requested;
PlayerInformation* _info;
wxPreferencesEditor* _config_dialog;
bool _update_news_requested;
PlayerInformation* _info;
wxPreferencesEditor* _config_dialog;