Merge 1.0.

diff --cc src/lib/player.cc
Simple merge

diff --cc src/wx/film_viewer.cc
index a1a47a943a3685811a4b3b6070b4c8aafc281774,00aa6bef3848e156034300d1d092d17789c24d17..03e8419a091f16b5fa95c7085af4f376824ff5a9
--- 1/src/wx/film_viewer.cc
--- 2/src/wx/film_viewer.cc
+++ b/src/wx/film_viewer.cc
@@@ -328,12 -335,21 +328,16 @@@ FilmViewer::fetch_next_frame (
  
        _got_frame = false;
        
 -      if (!_queue.empty ()) {
 -              process_video (_queue.back().first, EYES_BOTH, _queue.back().second);
 -              _queue.pop_back ();
 -      } else {
 -              try {
 -                      while (!_got_frame && !_player->pass ()) {}
 -              } catch (DecodeError& e) {
 -                      _play_button->SetValue (false);
 -                      check_play_state ();
 -                      error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data()));
 -              } catch (OpenFileError& e) {
 -                      /* There was a problem opening a content file; we'll let this slide as it
 -                         probably means a missing content file, which we're already taking care of.
 -                      */
 -              }
 +      try {
 +              while (!_got_frame && !_player->pass ()) {}
 +      } catch (DecodeError& e) {
 +              _play_button->SetValue (false);
 +              check_play_state ();
 +              error_dialog (this, wxString::Format (_("Could not decode video for view (%s)"), std_to_wx(e.what()).data()));
++      } catch (OpenFileError& e) {
++              /* There was a problem opening a content file; we'll let this slide as it
++                 probably means a missing content file, which we're already taking care of.
++              */
        }
  
        _panel->Refresh ();