diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-10-21 13:09:10 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-10-21 13:09:10 +0100 |
| commit | 6b368187e7bc16cbe0e83858f35990e536c5ccc8 (patch) | |
| tree | a7ee36003c7974c05a3555dc2a1cbd06dbca13ad /src/wx | |
| parent | 5b17eb3a0b0f95417c210ac3f7c3b66b5eac483c (diff) | |
Partial merge of examine content and thumbnail jobs.
Diffstat (limited to 'src/wx')
| -rw-r--r-- | src/wx/film_editor.cc | 1 | ||||
| -rw-r--r-- | src/wx/film_viewer.cc | 25 | ||||
| -rw-r--r-- | src/wx/film_viewer.h | 1 |
3 files changed, 0 insertions, 27 deletions
diff --git a/src/wx/film_editor.cc b/src/wx/film_editor.cc index 15755b9db..5d6513648 100644 --- a/src/wx/film_editor.cc +++ b/src/wx/film_editor.cc @@ -32,7 +32,6 @@ #include "lib/transcode_job.h" #include "lib/exceptions.h" #include "lib/ab_transcode_job.h" -#include "lib/thumbs_job.h" #include "lib/job_manager.h" #include "lib/filter.h" #include "lib/screen.h" diff --git a/src/wx/film_viewer.cc b/src/wx/film_viewer.cc index a3827fba1..f029a1a38 100644 --- a/src/wx/film_viewer.cc +++ b/src/wx/film_viewer.cc @@ -26,7 +26,6 @@ #include "lib/film.h" #include "lib/format.h" #include "lib/util.h" -#include "lib/thumbs_job.h" #include "lib/job_manager.h" #include "lib/film_state.h" #include "lib/options.h" @@ -277,8 +276,6 @@ FilmViewer::film_changed (FilmState::Property p) break; case FilmState::CONTENT: setup_visibility (); - _film->examine_content (); - update_thumbs (); break; case FilmState::CROP: case FilmState::FORMAT: @@ -313,28 +310,6 @@ FilmViewer::set_film (Film* f) } void -FilmViewer::update_thumbs () -{ - if (!_film) { - return; - } - - _film->update_thumbs_pre_gui (); - - shared_ptr<const FilmState> s = _film->state_copy (); - shared_ptr<Options> o (new Options (s->dir ("thumbs"), ".png", "")); - o->out_size = _film->size (); - o->apply_crop = false; - o->decode_audio = false; - o->decode_video_frequency = 128; - o->decode_subtitles = true; - - shared_ptr<Job> j (new ThumbsJob (s, o, _film->log(), shared_ptr<Job> ())); - j->Finished.connect (sigc::mem_fun (_film, &Film::update_thumbs_post_gui)); - JobManager::instance()->add (j); -} - -void FilmViewer::setup_visibility () { if (!_film) { diff --git a/src/wx/film_viewer.h b/src/wx/film_viewer.h index d2e597637..b5112c8bb 100644 --- a/src/wx/film_viewer.h +++ b/src/wx/film_viewer.h @@ -39,7 +39,6 @@ public: private: void slider_changed (wxCommandEvent &); - void update_thumbs (); void set_thumbnail (int); void film_changed (FilmState::Property); |