#include "wx_util.h"
#include "key_dialog.h"
#include "isdcf_metadata_dialog.h"
+#include "audio_dialog.h"
#include "lib/ratio.h"
#include "lib/config.h"
#include "lib/dcp_content_type.h"
#include "lib/util.h"
#include "lib/film.h"
#include "lib/ffmpeg_content.h"
+#include "lib/audio_processor.h"
#include <dcp/key.h>
+#include <dcp/raw_convert.h>
#include <wx/wx.h>
#include <wx/notebook.h>
#include <wx/gbsizer.h>
#include <wx/spinctrl.h>
#include <boost/lexical_cast.hpp>
+#include <boost/foreach.hpp>
using std::cout;
using std::list;
using std::string;
using std::vector;
+using std::pair;
+using std::max;
+using std::make_pair;
using boost::lexical_cast;
using boost::shared_ptr;
-DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> f)
- : _film (f)
+DCPPanel::DCPPanel (wxNotebook* n, boost::shared_ptr<Film> film)
+ : _audio_dialog (0)
+ , _film (film)
, _generally_sensitive (true)
{
_panel = new wxPanel (n);
_sizer->Add (grid, 0, wxEXPAND | wxALL, 8);
int r = 0;
-
+
add_label_to_grid_bag_sizer (grid, _panel, _("Name"), true, wxGBPosition (r, 0));
_name = new wxTextCtrl (_panel, wxID_ANY);
grid->Add (_name, wxGBPosition(r, 1), wxDefaultSpan, wxEXPAND | wxLEFT | wxRIGHT);
++r;
-
+
int flags = wxALIGN_CENTER_VERTICAL;
#ifdef __WXOSX__
flags |= wxALIGN_RIGHT;
-#endif
+#endif
_use_isdcf_name = new wxCheckBox (_panel, wxID_ANY, _("Use ISDCF name"));
grid->Add (_use_isdcf_name, wxGBPosition (r, 0), wxDefaultSpan, flags);
++r;
}
- add_label_to_grid_bag_sizer (grid, _panel, _("DCP Name"), true, wxGBPosition (r, 0));
- _dcp_name = new wxStaticText (_panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize, wxST_ELLIPSIZE_END);
- grid->Add (_dcp_name, wxGBPosition(r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL | wxEXPAND);
+ /* wxST_ELLIPSIZE_MIDDLE works around a bug in GTK2 and/or wxWidgets, see
+ http://trac.wxwidgets.org/ticket/12539
+ */
+ _dcp_name = new wxStaticText (
+ _panel, wxID_ANY, wxT (""), wxDefaultPosition, wxDefaultSize,
+ wxALIGN_CENTRE_HORIZONTAL | wxST_NO_AUTORESIZE | wxST_ELLIPSIZE_MIDDLE
+ );
+
+ grid->Add (_dcp_name, wxGBPosition(r, 0), wxGBSpan (1, 2), wxALIGN_CENTER_VERTICAL | wxEXPAND);
++r;
add_label_to_grid_bag_sizer (grid, _panel, _("Content Type"), true, wxGBPosition (r, 0));
_notebook->AddPage (make_video_panel (), _("Video"), false);
_notebook->AddPage (make_audio_panel (), _("Audio"), false);
-
+
_signed = new wxCheckBox (_panel, wxID_ANY, _("Signed"));
grid->Add (_signed, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
-
+
_encrypted = new wxCheckBox (_panel, wxID_ANY, _("Encrypted"));
grid->Add (_encrypted, wxGBPosition (r, 0), wxGBSpan (1, 2));
++r;
grid->Add (s, wxGBPosition (r, 1));
++r;
}
-
+
add_label_to_grid_bag_sizer (grid, _panel, _("Standard"), true, wxGBPosition (r, 0));
_standard = new wxChoice (_panel, wxID_ANY);
grid->Add (_standard, wxGBPosition (r, 1), wxDefaultSpan, wxALIGN_CENTER_VERTICAL);
if (!_film) {
return;
}
-
+
_film->set_j2k_bandwidth (_j2k_bandwidth->GetValue() * 1000000);
}
_film->set_encrypted (_encrypted->GetValue ());
}
-
+
/** Called when the frame rate choice widget has been changed */
void
DCPPanel::frame_rate_choice_changed ()
return;
}
- _film->set_audio_channels ((_audio_channels->GetSelection () + 1) * 2);
+ _film->set_audio_channels (dcp::raw_convert<int> (string_client_data (_audio_channels->GetClientObject (_audio_channels->GetSelection ()))));
}
void
break;
case Film::RESOLUTION:
checked_set (_resolution, _film->resolution() == RESOLUTION_2K ? 0 : 1);
+ setup_container ();
setup_dcp_name ();
break;
case Film::J2K_BANDWIDTH:
break;
}
case Film::AUDIO_CHANNELS:
- checked_set (_audio_channels, (_film->audio_channels () / 2) - 1);
- setup_dcp_name ();
+ if (_film->audio_channels () < minimum_allowed_audio_channels ()) {
+ _film->set_audio_channels (minimum_allowed_audio_channels ());
+ } else {
+ checked_set (_audio_channels, dcp::raw_convert<string> (max (minimum_allowed_audio_channels(), _film->audio_channels ())));
+ setup_dcp_name ();
+ }
break;
case Film::THREE_D:
checked_set (_three_d, _film->three_d ());
break;
case Film::INTEROP:
checked_set (_standard, _film->interop() ? 1 : 0);
+ setup_dcp_name ();
+ break;
+ case Film::AUDIO_PROCESSOR:
+ if (_film->audio_processor ()) {
+ checked_set (_audio_processor, _film->audio_processor()->id());
+ } else {
+ checked_set (_audio_processor, 0);
+ }
+ setup_audio_channels_choice ();
+ film_changed (Film::AUDIO_CHANNELS);
break;
default:
break;
void
DCPPanel::film_content_changed (int property)
{
- if (property == FFmpegContentProperty::AUDIO_STREAM ||
+ if (property == AudioContentProperty::AUDIO_STREAMS ||
property == SubtitleContentProperty::USE_SUBTITLES ||
property == VideoContentProperty::VIDEO_SCALE) {
setup_dcp_name ();
++i;
++n;
}
-
+
if (i == ratios.end()) {
checked_set (_container, -1);
+ checked_set (_container_size, wxT (""));
} else {
checked_set (_container, n);
+ dcp::Size const size = fit_ratio_within (_film->container()->ratio(), _film->full_frame ());
+ checked_set (_container_size, wxString::Format ("%dx%d", size.width, size.height));
}
-
+
setup_dcp_name ();
-}
+}
/** Called when the container widget has been changed */
void
DCPPanel::set_film (shared_ptr<Film> film)
{
_film = film;
-
+
film_changed (Film::NAME);
film_changed (Film::USE_ISDCF_NAME);
film_changed (Film::CONTENT);
film_changed (Film::SEQUENCE_VIDEO);
film_changed (Film::THREE_D);
film_changed (Film::INTEROP);
+ film_changed (Film::AUDIO_PROCESSOR);
}
void
}
_burn_subtitles->Enable (s);
_signed->Enable (si);
-
+
_encrypted->Enable (s);
_key->Enable (s && _film && _film->encrypted ());
_edit_key->Enable (s && _film && _film->encrypted ());
_frame_rate_choice->Enable (s);
_frame_rate_spin->Enable (s);
_audio_channels->Enable (s);
+ _audio_processor->Enable (s);
_j2k_bandwidth->Enable (s);
_container->Enable (s);
_best_frame_rate->Enable (s && _film && _film->best_video_frame_rate () != _film->video_frame_rate ());
void
DCPPanel::setup_dcp_name ()
{
- string s = _film->dcp_name (true);
- if (s.length() > 28) {
- _dcp_name->SetLabel (std_to_wx (s.substr (0, 28)) + N_("..."));
- _dcp_name->SetToolTip (std_to_wx (s));
- } else {
- _dcp_name->SetLabel (std_to_wx (s));
- }
+ _dcp_name->SetLabel (std_to_wx (_film->dcp_name (true)));
}
void
if (!_film) {
return;
}
-
+
_film->set_video_frame_rate (_film->best_video_frame_rate ());
}
panel->SetSizer (sizer);
int r = 0;
-
+
add_label_to_grid_bag_sizer (grid, panel, _("Container"), true, wxGBPosition (r, 0));
- _container = new wxChoice (panel, wxID_ANY);
- grid->Add (_container, wxGBPosition (r, 1));
- ++r;
+ {
+ wxBoxSizer* s = new wxBoxSizer (wxHORIZONTAL);
+ _container = new wxChoice (panel, wxID_ANY);
+ s->Add (_container, 1, wxEXPAND | wxRIGHT, DCPOMATIC_SIZER_X_GAP);
+ _container_size = new wxStaticText (panel, wxID_ANY, wxT (""));
+ s->Add (_container_size, 1, wxLEFT | wxALIGN_CENTER_VERTICAL);
+ grid->Add (s, wxGBPosition (r,1 ), wxDefaultSpan, wxEXPAND);
+ ++r;
+ }
+ add_label_to_grid_bag_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0));
{
- add_label_to_grid_bag_sizer (grid, panel, _("Frame Rate"), true, wxGBPosition (r, 0));
_frame_rate_sizer = new wxBoxSizer (wxHORIZONTAL);
_frame_rate_choice = new wxChoice (panel, wxID_ANY);
_frame_rate_sizer->Add (_frame_rate_choice, 1, wxALIGN_CENTER_VERTICAL);
_best_frame_rate = new wxButton (panel, wxID_ANY, _("Use best"));
_frame_rate_sizer->Add (_best_frame_rate, 1, wxALIGN_CENTER_VERTICAL);
grid->Add (_frame_rate_sizer, wxGBPosition (r, 1));
+ ++r;
}
- ++r;
_burn_subtitles = new wxCheckBox (panel, wxID_ANY, _("Burn subtitles into image"));
grid->Add (_burn_subtitles, wxGBPosition (r, 0), wxGBSpan (1, 2));
return panel;
}
+int
+DCPPanel::minimum_allowed_audio_channels () const
+{
+ int min = 2;
+ if (_film && _film->audio_processor ()) {
+ min = _film->audio_processor()->out_channels ();
+ }
+
+ if (min % 2 == 1) {
+ ++min;
+ }
+
+ return min;
+}
+
+void
+DCPPanel::setup_audio_channels_choice ()
+{
+ vector<pair<string, string> > items;
+ for (int i = minimum_allowed_audio_channels(); i <= 12; i += 2) {
+ items.push_back (make_pair (dcp::raw_convert<string> (i), dcp::raw_convert<string> (i)));
+ }
+
+ checked_set (_audio_channels, items);
+}
+
wxPanel *
DCPPanel::make_audio_panel ()
{
panel->SetSizer (sizer);
int r = 0;
+
add_label_to_grid_bag_sizer (grid, panel, _("Channels"), true, wxGBPosition (r, 0));
_audio_channels = new wxChoice (panel, wxID_ANY);
- for (int i = 2; i <= 12; i += 2) {
- _audio_channels->Append (wxString::Format ("%d", i));
- }
+ setup_audio_channels_choice ();
grid->Add (_audio_channels, wxGBPosition (r, 1));
++r;
+ add_label_to_grid_bag_sizer (grid, panel, _("Processor"), true, wxGBPosition (r, 0));
+ _audio_processor = new wxChoice (panel, wxID_ANY);
+ _audio_processor->Append (_("None"), new wxStringClientData (N_("none")));
+ BOOST_FOREACH (AudioProcessor const * ap, AudioProcessor::all ()) {
+ _audio_processor->Append (std_to_wx (ap->name ()), new wxStringClientData (std_to_wx (ap->id ())));
+ }
+ grid->Add (_audio_processor, wxGBPosition (r, 1));
+ ++r;
+
+ _show_audio = new wxButton (panel, wxID_ANY, _("Show audio..."));
+ grid->Add (_show_audio, wxGBPosition (r, 0), wxGBSpan (1, 2));
+ ++r;
+
_audio_channels->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::audio_channels_changed, this));
+ _audio_processor->Bind (wxEVT_COMMAND_CHOICE_SELECTED, boost::bind (&DCPPanel::audio_processor_changed, this));
+ _show_audio->Bind (wxEVT_COMMAND_BUTTON_CLICKED, boost::bind (&DCPPanel::show_audio_clicked, this));
return panel;
}
_film->set_name (_film->isdcf_name (false));
_film->set_use_isdcf_name (false);
}
+
+void
+DCPPanel::audio_processor_changed ()
+{
+ if (!_film) {
+ return;
+ }
+
+ string const s = string_client_data (_audio_processor->GetClientObject (_audio_processor->GetSelection ()));
+ _film->set_audio_processor (AudioProcessor::from_id (s));
+}
+
+void
+DCPPanel::show_audio_clicked ()
+{
+ if (!_film) {
+ return;
+ }
+
+ if (_audio_dialog) {
+ _audio_dialog->Destroy ();
+ _audio_dialog = 0;
+ }
+
+ AudioDialog* d = new AudioDialog (_panel, _film);
+ d->Show ();
+}
projects / dcpomatic.git / blobdiff