X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Ftools%2Fdcpomatic.cc;fp=src%2Ftools%2Fdcpomatic.cc;h=3bef7bce300f663be2ca9340f7e8d4f9313d6dab;hb=cb1dfa9ec09af2abf6d10e4bf2764476db83841b;hp=6b7ad027303392c638fffc043916150ef2b266d8;hpb=4092121ad052f406e8b5c5a2debbd8256321f182;p=dcpomatic.git

diff --git a/src/tools/dcpomatic.cc b/src/tools/dcpomatic.cc
index 6b7ad0273..3bef7bce3 100644
--- a/src/tools/dcpomatic.cc
+++ b/src/tools/dcpomatic.cc
@@ -30,7 +30,7 @@
 #include <wx/stdpaths.h>
 #include <wx/cmdline.h>
 #include <wx/preferences.h>
-#include <libdcp/exceptions.h>
+#include <dcp/exceptions.h>
 #include "wx/film_viewer.h"
 #include "wx/film_editor.h"
 #include "wx/job_manager_view.h"
@@ -45,6 +45,7 @@
 #include "wx/servers_list_dialog.h"
 #include "wx/hints_dialog.h"
 #include "wx/update_dialog.h"
+#include "wx/content_panel.h"
 #include "lib/film.h"
 #include "lib/config.h"
 #include "lib/util.h"
@@ -402,7 +403,7 @@ private:
 					shared_ptr<Job> (new SendKDMEmailJob (_film, d->screens (), d->cpl (), d->from (), d->until (), d->formulation ()))
 					);
 			}
-		} catch (libdcp::NotEncryptedError& e) {
+		} catch (dcp::NotEncryptedError& e) {
 			error_dialog (this, _("CPL's content is not encrypted."));
 		} catch (exception& e) {
 			error_dialog (this, e.what ());
@@ -415,7 +416,7 @@ private:
 
 	void content_scale_to_fit_width ()
 	{
-		VideoContentList vc = _film_editor->selected_video_content ();
+		VideoContentList vc = _film_editor->content_panel()->selected_video ();
 		for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
 			(*i)->scale_and_crop_to_fit_width ();
 		}
@@ -423,7 +424,7 @@ private:
 
 	void content_scale_to_fit_height ()
 	{
-		VideoContentList vc = _film_editor->selected_video_content ();
+		VideoContentList vc = _film_editor->content_panel()->selected_video ();
 		for (VideoContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
 			(*i)->scale_and_crop_to_fit_height ();
 		}
@@ -529,7 +530,7 @@ private:
 		}
 		bool const dcp_creation = (i != jobs.end ()) && !(*i)->finished ();
 		bool const have_cpl = _film && !_film->cpls().empty ();
-		bool const have_selected_video_content = !_film_editor->selected_video_content().empty();
+		bool const have_selected_video_content = !_film_editor->content_panel()->selected_video().empty();
 		
 		for (map<wxMenuItem*, int>::iterator j = menu_items.begin(); j != menu_items.end(); ++j) {
 			
@@ -693,6 +694,9 @@ static const wxCmdLineEntryDesc command_line_description[] = {
 	{ wxCMD_LINE_NONE, "", "", "", wxCmdLineParamType (0), 0 }
 };
 
+/** @class App
+ *  @brief The magic App class for wxWidgets.
+ */
 class App : public wxApp
 {
 	bool OnInit ()