projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Try wxFRAME_FLOAT_ON_PARENT instead of wxSTAY_ON_TOP (#909).
[dcpomatic.git]
/
src
/
wx
/
audio_dialog.cc
diff --git
a/src/wx/audio_dialog.cc
b/src/wx/audio_dialog.cc
index a1354e9f87ee91ce8115cc4eb71c901da76d0ec5..b7f1f613b0723252158d61ea5d8db367a6c589d6 100644
(file)
--- a/
src/wx/audio_dialog.cc
+++ b/
src/wx/audio_dialog.cc
@@
-1,19
+1,20
@@
/*
Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
/*
Copyright (C) 2013-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.
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
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/>.
*/
*/
@@
-40,7
+41,14
@@
using boost::dynamic_pointer_cast;
/** @param content Content to analyse, or 0 to analyse all of the film's audio */
AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content)
/** @param content Content to analyse, or 0 to analyse all of the film's audio */
AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Content> content)
- : wxDialog (parent, wxID_ANY, _("Audio"), wxDefaultPosition, wxSize (640, 512), wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE)
+ : wxDialog (
+ parent,
+ wxID_ANY,
+ _("Audio"),
+ wxDefaultPosition,
+ wxSize (640, 512),
+ wxDEFAULT_DIALOG_STYLE | wxRESIZE_BORDER | wxFULL_REPAINT_ON_RESIZE | wxFRAME_FLOAT_ON_PARENT
+ )
, _film (film)
, _content (content)
, _channels (film->audio_channels ())
, _film (film)
, _content (content)
, _channels (film->audio_channels ())
@@
-81,6
+89,10
@@
AudioDialog::AudioDialog (wxWindow* parent, shared_ptr<Film> film, shared_ptr<Co
_channel_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::channel_clicked, this, _1));
}
_channel_checkbox[i]->Bind (wxEVT_COMMAND_CHECKBOX_CLICKED, boost::bind (&AudioDialog::channel_clicked, this, _1));
}
+ for (int i = _channels; i < MAX_DCP_AUDIO_CHANNELS; ++i) {
+ _channel_checkbox[i] = 0;
+ }
+
{
wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type"));
m->SetFont (subheading_font);
{
wxStaticText* m = new wxStaticText (this, wxID_ANY, _("Type"));
m->SetFont (subheading_font);
@@
-175,10
+187,10
@@
AudioDialog::try_to_load_analysis ()
/* Nothing checked; check mapped ones */
list<int> mapped;
/* Nothing checked; check mapped ones */
list<int> mapped;
- shared_ptr<
Audio
Content> content = _content.lock ();
+ shared_ptr<Content> content = _content.lock ();
if (content) {
if (content) {
- mapped = content->audio
_
mapping().mapped_output_channels ();
+ mapped = content->audio
->
mapping().mapped_output_channels ();
} else {
mapped = film->mapped_audio_channels ();
}
} else {
mapped = film->mapped_audio_channels ();
}
@@
-210,7
+222,10
@@
void
AudioDialog::analysis_finished ()
{
shared_ptr<const Film> film = _film.lock ();
AudioDialog::analysis_finished ()
{
shared_ptr<const Film> film = _film.lock ();
- DCPOMATIC_ASSERT (film);
+ if (!film) {
+ /* This should not happen, but if it does we should just give up quietly */
+ return;
+ }
if (!boost::filesystem::exists (film->audio_analysis_path (_playlist))) {
/* We analysed and still nothing showed up, so maybe it was cancelled or it failed.
if (!boost::filesystem::exists (film->audio_analysis_path (_playlist))) {
/* We analysed and still nothing showed up, so maybe it was cancelled or it failed.