projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Differentiate between stop and suspend in player.
[dcpomatic.git]
/
src
/
wx
/
film_viewer.h
diff --git
a/src/wx/film_viewer.h
b/src/wx/film_viewer.h
index 298e9dd00591ca22e7e1609077c30fa45c4efb9d..1f20c3321f0ccc999f285c01692edd000010e872 100644
(file)
--- a/
src/wx/film_viewer.h
+++ b/
src/wx/film_viewer.h
@@
-75,6
+75,8
@@
public:
void start ();
bool stop ();
void start ();
bool stop ();
+ void suspend ();
+ void resume ();
bool playing () const {
return _playing;
}
bool playing () const {
return _playing;
}
@@
-151,7
+153,9
@@
private:
void timer ();
void calculate_sizes ();
void player_change (ChangeType type, int, bool);
void timer ();
void calculate_sizes ();
void player_change (ChangeType type, int, bool);
- void get (bool lazy);
+ bool get (bool lazy);
+ void idle_handler ();
+ void request_idle_get ();
void display_player_video ();
void film_change (ChangeType, Film::Property);
void recreate_butler ();
void display_player_video ();
void film_change (ChangeType, Film::Property);
void recreate_butler ();
@@
-184,6
+188,7
@@
private:
int _audio_channels;
unsigned int _audio_block_size;
bool _playing;
int _audio_channels;
unsigned int _audio_block_size;
bool _playing;
+ int _suspended;
boost::shared_ptr<Butler> _butler;
std::list<Frame> _latency_history;
boost::shared_ptr<Butler> _butler;
std::list<Frame> _latency_history;
@@
-210,5
+215,8
@@
private:
StateTimer _state_timer;
int _gets;
StateTimer _state_timer;
int _gets;
+ /** true if an get() is required next time we are idle */
+ bool _idle_get;
+
boost::signals2::scoped_connection _config_changed_connection;
};
boost::signals2::scoped_connection _config_changed_connection;
};