/*
- Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ This file is part of DCP-o-matic.
+
+ DCP-o-matic is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation; either version 2 of the License, or
(at your option) any later version.
- This program is distributed in the hope that it will be useful,
+ DCP-o-matic is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
- along with this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
#include "lib/config.h"
#include "lib/util.h"
#include "lib/video_content.h"
+#include "lib/content.h"
#include "lib/version.h"
#include "lib/signal_manager.h"
#include "lib/log.h"
#include "lib/cinema_kdms.h"
#include "lib/dcpomatic_socket.h"
#include <dcp/exceptions.h>
-#include <dcp/raw_convert.h>
#include <wx/generic/aboutdlgg.h>
#include <wx/stdpaths.h>
#include <wx/cmdline.h>
#include <ApplicationServices/ApplicationServices.h>
#endif
#include <boost/filesystem.hpp>
+#include <boost/noncopyable.hpp>
#include <iostream>
#include <fstream>
#include <sstream>
using std::exception;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
-using dcp::raw_convert;
+using boost::optional;
-class FilmChangedDialog
+class FilmChangedDialog : public boost::noncopyable
{
public:
FilmChangedDialog (string name)
/// TRANSLATORS: this is the heading for a dialog box, which tells the user that the current
/// project (Film) has been changed since it was last saved.
_("Film changed"),
- wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
+ wxYES_NO | wxCANCEL | wxYES_DEFAULT | wxICON_QUESTION
+ );
+
+ _dialog->SetYesNoCancelLabels (
+ _("Save film and close"), _("Close without saving film"), _("Don't close")
);
}
}
private:
- /* Not defined */
- FilmChangedDialog (FilmChangedDialog const &);
-
wxMessageDialog* _dialog;
};
ID_tools_restore_default_preferences,
ID_help_report_a_problem,
/* IDs for shortcuts (with no associated menu item) */
- ID_add_file
+ ID_add_file,
+ ID_remove
};
class DOMFrame : public wxFrame
overall_panel->SetSizer (main_sizer);
- wxAcceleratorEntry accel[1];
+ wxAcceleratorEntry accel[2];
accel[0].Set (wxACCEL_CTRL, static_cast<int>('A'), ID_add_file);
+ accel[1].Set (wxACCEL_NORMAL, WXK_DELETE, ID_remove);
Bind (wxEVT_MENU, boost::bind (&ContentPanel::add_file_clicked, _film_editor->content_panel()), ID_add_file);
- wxAcceleratorTable accel_table (1, accel);
+ Bind (wxEVT_MENU, boost::bind (&DOMFrame::remove_clicked, this, _1), ID_remove);
+ wxAcceleratorTable accel_table (2, accel);
SetAcceleratorTable (accel_table);
/* Instantly save any config changes when using the DCP-o-matic GUI */
UpdateChecker::instance()->StateChanged.connect (boost::bind (&DOMFrame::update_checker_state_changed, this));
}
+ void remove_clicked (wxCommandEvent& ev)
+ {
+ if (_film_editor->content_panel()->remove_clicked (true)) {
+ ev.Skip ();
+ }
+ }
+
void new_film (boost::filesystem::path path)
{
shared_ptr<Film> film (new Film (path));
void load_film (boost::filesystem::path file)
try
{
- maybe_save_then_delete_film ();
-
shared_ptr<Film> film (new Film (file));
list<string> const notes = film->read_metadata ();
return;
}
- maybe_save_then_delete_film ();
- new_film (d->get_path ());
+ if (maybe_save_then_delete_film ()) {
+ new_film (d->get_path ());
+ }
}
d->Destroy ();
}
}
- if (r == wxID_OK) {
+ if (r == wxID_OK && maybe_save_then_delete_film()) {
load_film (wx_to_std (c->GetPath ()));
}
{
vector<boost::filesystem::path> history = Config::instance()->history ();
int n = event.GetId() - ID_file_history;
- if (n >= 0 && n < static_cast<int> (history.size ())) {
+ if (n >= 0 && n < static_cast<int> (history.size ()) && maybe_save_then_delete_film()) {
load_film (history[n]);
}
}
void tools_restore_default_preferences ()
{
- Config::restore_defaults ();
+ wxMessageDialog* d = new wxMessageDialog (
+ 0,
+ _("Are you sure you want to restore preferences to their defaults? This cannot be undone."),
+ _("Restore default preferences"),
+ wxYES_NO | wxYES_DEFAULT | wxICON_QUESTION
+ );
+
+ int const r = d->ShowModal ();
+ d->Destroy ();
+
+ if (r == wxID_YES) {
+ Config::restore_defaults ();
+ }
}
void jobs_make_dcp ()
/* i = 0; try to connect via socket
i = 1; try again, and then try to start the batch converter
- i = 2; try again.
- i = 3; try again.
+ i = 2 onwards; try again.
*/
- for (int i = 0; i < 4; ++i) {
+ for (int i = 0; i < 8; ++i) {
try {
boost::asio::io_service io_service;
boost::asio::ip::tcp::resolver resolver (io_service);
- boost::asio::ip::tcp::resolver::query query ("localhost", raw_convert<string> (Config::instance()->server_port_base() + 2));
+ boost::asio::ip::tcp::resolver::query query ("127.0.0.1", raw_convert<string> (Config::instance()->server_port_base() + 2));
boost::asio::ip::tcp::resolver::iterator endpoint_iterator = resolver.resolve (query);
- Socket socket (1);
+ Socket socket (5);
socket.connect (*endpoint_iterator);
string s = _film->directory().string ();
socket.write (s.length() + 1);
socket.write ((uint8_t *) s.c_str(), s.length() + 1);
+ /* OK\0 */
+ uint8_t ok[3];
+ socket.read (ok, 3);
return;
} catch (exception& e) {
- std::cout << "start batch failed: " << e.what() << "\n";
+
}
if (i == 1) {
return;
}
+ optional<dcp::EncryptedKDM> kdm;
try {
- dcp::EncryptedKDM kdm = _film->make_kdm (
+ kdm = _film->make_kdm (
Config::instance()->decryption_chain()->leaf(),
vector<dcp::Certificate> (),
d->cpl (),
dcp::LocalTime ("2112-01-01T01:00:00+00:00"),
dcp::MODIFIED_TRANSITIONAL_1
);
-
- string const name = tidy_for_filename(_film->name()) + "_DKDM.kdm.xml";
- kdm.as_xml (d->directory() / name);
} catch (dcp::NotEncryptedError& e) {
error_dialog (this, _("CPL's content is not encrypted."));
} catch (exception& e) {
error_dialog (this, _("An unknown exception occurred."));
}
+ if (kdm) {
+ if (d->internal ()) {
+ vector<dcp::EncryptedKDM> dkdms = Config::instance()->dkdms ();
+ dkdms.push_back (kdm.get());
+ Config::instance()->set_dkdms (dkdms);
+ } else {
+ boost::filesystem::path path = d->directory() / (_film->dcp_name(false) + "_DKDM.xml");
+ kdm->as_xml (path);
+ }
+ }
+
d->Destroy ();
}
void content_scale_to_fit_width ()
{
- 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 ();
+ ContentList vc = _film_editor->content_panel()->selected_video ();
+ for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
+ (*i)->video->scale_and_crop_to_fit_width ();
}
}
void content_scale_to_fit_height ()
{
- 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 ();
+ ContentList vc = _film_editor->content_panel()->selected_video ();
+ for (ContentList::iterator i = vc.begin(); i != vc.end(); ++i) {
+ (*i)->video->scale_and_crop_to_fit_height ();
}
}
return;
}
+ if (_film && _film->dirty ()) {
+
+ FilmChangedDialog* dialog = new FilmChangedDialog (_film->name ());
+ int const r = dialog->run ();
+ delete dialog;
+
+ switch (r) {
+ case wxID_NO:
+ /* Don't save and carry on to close */
+ break;
+ case wxID_YES:
+ /* Save and carry on to close */
+ _film->write_metadata ();
+ break;
+ case wxID_CANCEL:
+ /* Veto the event and stop */
+ ev.Veto ();
+ return;
+ }
+ }
+
/* We don't want to hear about any more configuration changes, since they
cause the File menu to be altered, which itself will be deleted around
now (without, as far as I can see, any way for us to find out).
*/
_config_changed_connection.disconnect ();
- maybe_save_then_delete_film ();
ev.Skip ();
}
}
}
- void maybe_save_then_delete_film ()
+ /** @return true if the operation that called this method
+ * should continue, false to abort it.
+ */
+ bool maybe_save_then_delete_film ()
{
if (!_film) {
- return;
+ return true;
}
if (_film->dirty ()) {
case wxID_YES:
_film->write_metadata ();
break;
+ case wxID_CANCEL:
+ return false;
}
}
_film.reset ();
+ return true;
}
void add_item (wxMenu* menu, wxString text, int id, int sens)
wxSplashScreen* splash = 0;
try {
- if (!Config::have_existing ()) {
+ if (!Config::have_existing ("config.xml")) {
wxBitmap bitmap;
boost::filesystem::path p = shared_path () / "splash.png";
if (bitmap.LoadFile (std_to_wx (p.string ()), wxBITMAP_TYPE_PNG)) {
error_dialog (
0,
wxString::Format (
- _("An exception occurred: %s.\n\n") + " " + REPORT_PROBLEM,
+ _("An exception occurred: %s.\n\n") + REPORT_PROBLEM,
std_to_wx (e.what ())
)
);
projects / dcpomatic.git / blobdiff