projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge master.
[dcpomatic.git]
/
src
/
wx
/
audio_panel.cc
diff --git
a/src/wx/audio_panel.cc
b/src/wx/audio_panel.cc
index 917775181eeb00d9a7cafb8a02ff533db527e470..179d7db7115e315fd42d37df378a129df35f7e9c 100644
(file)
--- a/
src/wx/audio_panel.cc
+++ b/
src/wx/audio_panel.cc
@@
-22,6
+22,7
@@
#include "lib/config.h"
#include "lib/sound_processor.h"
#include "lib/ffmpeg_content.h"
#include "lib/config.h"
#include "lib/sound_processor.h"
#include "lib/ffmpeg_content.h"
+#include "lib/ffmpeg_audio_stream.h"
#include "audio_dialog.h"
#include "audio_panel.h"
#include "audio_mapping_view.h"
#include "audio_dialog.h"
#include "audio_panel.h"
#include "audio_mapping_view.h"
@@
-239,7
+240,7
@@
AudioPanel::setup_stream_description ()
} else {
s << fcs->audio_channels() << wxT (" ") << _("channels");
}
} else {
s << fcs->audio_channels() << wxT (" ") << _("channels");
}
- s << wxT (", ") << fcs->
content_
audio_frame_rate() << _("Hz");
+ s << wxT (", ") << fcs->audio_frame_rate() << _("Hz");
_description->SetLabel (s);
}
}
_description->SetLabel (s);
}
}