projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
std::shared_ptr
[dcpomatic.git]
/
src
/
wx
/
gl_video_view.h
diff --git
a/src/wx/gl_video_view.h
b/src/wx/gl_video_view.h
index 675b324fc4d4095c9df248bea2a859edbfbb6c67..d8ee65da63e04d63fc572676d6ff7b9a2c8b24f8 100644
(file)
--- a/
src/wx/gl_video_view.h
+++ b/
src/wx/gl_video_view.h
@@
-28,7
+28,6
@@
DCPOMATIC_DISABLE_WARNINGS
DCPOMATIC_ENABLE_WARNINGS
#include <dcp/util.h>
#include <boost/atomic.hpp>
DCPOMATIC_ENABLE_WARNINGS
#include <dcp/util.h>
#include <boost/atomic.hpp>
-#include <boost/shared_ptr.hpp>
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#undef None
#include <boost/thread.hpp>
#include <boost/thread/condition.hpp>
#undef None
@@
-55,7
+54,7
@@
public:
}
private:
}
private:
- void set_image (
boost
::shared_ptr<const Image> image);
+ void set_image (
std
::shared_ptr<const Image> image);
void set_image_and_draw ();
void draw (Position<int> inter_position, dcp::Size inter_size);
void thread ();
void set_image_and_draw ();
void draw (Position<int> inter_position, dcp::Size inter_size);
void thread ();
@@
-81,5
+80,5
@@
private:
boost::atomic<bool> _playing;
boost::atomic<bool> _one_shot;
boost::atomic<bool> _playing;
boost::atomic<bool> _one_shot;
-
boost
::shared_ptr<wxTimer> _timer;
+
std
::shared_ptr<wxTimer> _timer;
};
};