projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
8615f1d
)
Include trimming.
author
Carl Hetherington
<cth@carlh.net>
Sat, 12 Mar 2016 18:59:40 +0000
(18:59 +0000)
committer
Carl Hetherington
<cth@carlh.net>
Sat, 12 Mar 2016 18:59:40 +0000
(18:59 +0000)
src/lib/text_subtitle_content.cc
patch
|
blob
|
history
src/wx/audio_mapping_view.cc
patch
|
blob
|
history
src/wx/audio_panel.cc
patch
|
blob
|
history
src/wx/colour_conversion_editor.cc
patch
|
blob
|
history
src/wx/config_dialog.cc
patch
|
blob
|
history
src/wx/subtitle_panel.cc
patch
|
blob
|
history
src/wx/timecode.cc
patch
|
blob
|
history
test/ffmpeg_audio_test.cc
patch
|
blob
|
history
diff --git
a/src/lib/text_subtitle_content.cc
b/src/lib/text_subtitle_content.cc
index 93ac1d09194684e08a613aed80b97881bfb0091e..2044c3a41336ea76a31e07c713dc90067c3c96ef 100644
(file)
--- a/
src/lib/text_subtitle_content.cc
+++ b/
src/lib/text_subtitle_content.cc
@@
-31,7
+31,6
@@
using std::string;
using std::cout;
using boost::shared_ptr;
using std::string;
using std::cout;
using boost::shared_ptr;
-using boost::lexical_cast;
std::string const TextSubtitleContent::font_id = "font";
std::string const TextSubtitleContent::font_id = "font";
diff --git
a/src/wx/audio_mapping_view.cc
b/src/wx/audio_mapping_view.cc
index 407abb503b801173565571936d47b32afe2c641c..d1c8497dae6bfc0cb5af749e6b45fec5f117ae03 100644
(file)
--- a/
src/wx/audio_mapping_view.cc
+++ b/
src/wx/audio_mapping_view.cc
@@
-31,7
+31,6
@@
#include <wx/wx.h>
#include <wx/renderer.h>
#include <wx/grid.h>
#include <wx/wx.h>
#include <wx/renderer.h>
#include <wx/grid.h>
-#include <boost/lexical_cast.hpp>
#include <iostream>
using std::cout;
#include <iostream>
using std::cout;
@@
-40,7
+39,6
@@
using std::string;
using std::max;
using std::vector;
using boost::shared_ptr;
using std::max;
using std::vector;
using boost::shared_ptr;
-using boost::lexical_cast;
#define INDICATOR_SIZE 16
#define INDICATOR_SIZE 16
diff --git
a/src/wx/audio_panel.cc
b/src/wx/audio_panel.cc
index 34d6ac885be65d410f10df59ad9348e12e1c0b93..10f855cfed682cb4185a4bdc85d6a0ba2b5ddd72 100644
(file)
--- a/
src/wx/audio_panel.cc
+++ b/
src/wx/audio_panel.cc
@@
-29,7
+29,6
@@
#include "lib/job_manager.h"
#include "lib/dcp_content.h"
#include <wx/spinctrl.h>
#include "lib/job_manager.h"
#include "lib/dcp_content.h"
#include <wx/spinctrl.h>
-#include <boost/lexical_cast.hpp>
#include <boost/foreach.hpp>
#include <iostream>
#include <boost/foreach.hpp>
#include <iostream>
@@
-39,7
+38,6
@@
using std::string;
using std::list;
using std::pair;
using boost::dynamic_pointer_cast;
using std::list;
using std::pair;
using boost::dynamic_pointer_cast;
-using boost::lexical_cast;
using boost::shared_ptr;
using boost::optional;
using boost::shared_ptr;
using boost::optional;
diff --git
a/src/wx/colour_conversion_editor.cc
b/src/wx/colour_conversion_editor.cc
index 879b16b6f2762b9bddc4f45411c8c3fb66f07086..aab05d71bd3836dd4b7be9b73bfacc549a4fe889 100644
(file)
--- a/
src/wx/colour_conversion_editor.cc
+++ b/
src/wx/colour_conversion_editor.cc
@@
-26,14
+26,12
@@
#include <dcp/modified_gamma_transfer_function.h>
#include <wx/spinctrl.h>
#include <wx/gbsizer.h>
#include <dcp/modified_gamma_transfer_function.h>
#include <wx/spinctrl.h>
#include <wx/gbsizer.h>
-#include <boost/lexical_cast.hpp>
#include <iostream>
using std::string;
using std::cout;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
#include <iostream>
using std::string;
using std::cout;
using boost::shared_ptr;
using boost::dynamic_pointer_cast;
-using boost::lexical_cast;
ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
: wxPanel (parent, wxID_ANY)
ColourConversionEditor::ColourConversionEditor (wxWindow* parent, bool yuv)
: wxPanel (parent, wxID_ANY)
diff --git
a/src/wx/config_dialog.cc
b/src/wx/config_dialog.cc
index 89db8791d5e12d6f1e8688479855326d4f448095..7e70326dcaa874eba764371acddde8307fef06b3 100644
(file)
--- a/
src/wx/config_dialog.cc
+++ b/
src/wx/config_dialog.cc
@@
-46,7
+46,6
@@
#include <wx/preferences.h>
#include <wx/spinctrl.h>
#include <wx/filepicker.h>
#include <wx/preferences.h>
#include <wx/spinctrl.h>
#include <wx/filepicker.h>
-#include <boost/lexical_cast.hpp>
#include <boost/filesystem.hpp>
#include <boost/foreach.hpp>
#include <iostream>
#include <boost/filesystem.hpp>
#include <boost/foreach.hpp>
#include <iostream>
@@
-57,7
+56,6
@@
using std::list;
using std::cout;
using boost::bind;
using boost::shared_ptr;
using std::cout;
using boost::bind;
using boost::shared_ptr;
-using boost::lexical_cast;
using boost::function;
using boost::optional;
using boost::function;
using boost::optional;
diff --git
a/src/wx/subtitle_panel.cc
b/src/wx/subtitle_panel.cc
index 9422bb89428625f874ffe9e8fc5918688b61b10b..ad6a024e6682ed2193597641deedf4a4711ccba2 100644
(file)
--- a/
src/wx/subtitle_panel.cc
+++ b/
src/wx/subtitle_panel.cc
@@
-33,14
+33,12
@@
#include "lib/dcp_subtitle_decoder.h"
#include "lib/dcp_content.h"
#include <wx/spinctrl.h>
#include "lib/dcp_subtitle_decoder.h"
#include "lib/dcp_content.h"
#include <wx/spinctrl.h>
-#include <boost/lexical_cast.hpp>
#include <boost/foreach.hpp>
using std::vector;
using std::string;
using std::list;
using boost::shared_ptr;
#include <boost/foreach.hpp>
using std::vector;
using std::string;
using std::list;
using boost::shared_ptr;
-using boost::lexical_cast;
using boost::dynamic_pointer_cast;
SubtitlePanel::SubtitlePanel (ContentPanel* p)
using boost::dynamic_pointer_cast;
SubtitlePanel::SubtitlePanel (ContentPanel* p)
diff --git
a/src/wx/timecode.cc
b/src/wx/timecode.cc
index 40a22201e3364cbb46e971e7f08a7cfa24bcc7a4..043d4bc87536b8b5cd968dda7d0fab5180313392 100644
(file)
--- a/
src/wx/timecode.cc
+++ b/
src/wx/timecode.cc
@@
-20,12
+20,10
@@
#include "lib/util.h"
#include "timecode.h"
#include "wx_util.h"
#include "lib/util.h"
#include "timecode.h"
#include "wx_util.h"
-#include <boost/lexical_cast.hpp>
#include <iostream>
using std::string;
using std::cout;
#include <iostream>
using std::string;
using std::cout;
-using boost::lexical_cast;
TimecodeBase::TimecodeBase (wxWindow* parent)
: wxPanel (parent)
TimecodeBase::TimecodeBase (wxWindow* parent)
: wxPanel (parent)
@@
-120,5
+118,3
@@
TimecodeBase::size (wxWindow* parent)
size.SetHeight (-1);
return size;
}
size.SetHeight (-1);
return size;
}
-
-
diff --git
a/test/ffmpeg_audio_test.cc
b/test/ffmpeg_audio_test.cc
index aac32edc0882c747a6823bad6070d29c4f10bb86..a93d77fc188d39ae84feafcbfd96ab5939769196 100644
(file)
--- a/
test/ffmpeg_audio_test.cc
+++ b/
test/ffmpeg_audio_test.cc
@@
-36,7
+36,6
@@
#include "test.h"
using std::string;
#include "test.h"
using std::string;
-using boost::lexical_cast;
using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)
using boost::shared_ptr;
BOOST_AUTO_TEST_CASE (ffmpeg_audio_test)