OpenShot Video Library | libopenshot

Merge lp:~mbranton/libopenshot/int64_fixes into lp:libopenshot/0.0

  1. int64_fixes
  2. Merge into trunk
Proposed by matt
Status: Needs review
Proposed branch: lp:~mbranton/libopenshot/int64_fixes
Merge into: lp:libopenshot/0.0
Diff against target: 73 lines (+8/-8)
4 files modified
include/AudioReaderSource.h (+4/-4)
include/FFmpegWriter.h (+2/-2)
include/Frame.h (+1/-1)
src/Color.cpp (+1/-1)
To merge this branch: bzr merge lp:~mbranton/libopenshot/int64_fixes
Reviewer Review Type Date Requested Status
OpenShot Code Pending
Review via email: mp+308589@code.launchpad.net

Description of the change

I have namespace collisions with int64 definitions in libopenshot, this prefixes such definitions to refer to the global namespace definition.

To post a comment you must log in.

Unmerged revisions

562. By Matt Branton <email address hidden>

int64 is ambiguous when trying to add certain external dependencies to libopenshot

561. By Matt Branton <email address hidden>

Set color format so that alpha can be preserved on flood fills

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
=== modified file 'include/AudioReaderSource.h'
--- include/AudioReaderSource.h 2015-02-05 05:56:43 +0000
+++ include/AudioReaderSource.h 2016-10-16 19:11:23 +0000
@@ -61,8 +61,8 @@
61 int speed; /// The speed and direction to playback a reader (1=normal, 2=fast, 3=faster, -1=rewind, etc...)61 int speed; /// The speed and direction to playback a reader (1=normal, 2=fast, 3=faster, -1=rewind, etc...)
6262
63 ReaderBase *reader; /// The reader to pull samples from63 ReaderBase *reader; /// The reader to pull samples from
64 int64 original_frame_number; /// The current frame to read from64 ::int64 original_frame_number; /// The current frame to read from
65 int64 frame_number; /// The current frame number65 ::int64 frame_number; /// The current frame number
66 tr1::shared_ptr<Frame> frame; /// The current frame object that is being read66 tr1::shared_ptr<Frame> frame; /// The current frame object that is being read
67 int frame_position; /// The position of the current frame's buffer67 int frame_position; /// The position of the current frame's buffer
68 double estimated_frame; /// The estimated frame position of the currently playing buffer68 double estimated_frame; /// The estimated frame position of the currently playing buffer
@@ -80,7 +80,7 @@
80 /// @param audio_reader This reader provides constant samples from a ReaderBase derived class80 /// @param audio_reader This reader provides constant samples from a ReaderBase derived class
81 /// @param starting_frame_number This is the frame number to start reading samples from the reader.81 /// @param starting_frame_number This is the frame number to start reading samples from the reader.
82 /// @param buffer_size The max number of samples to keep in the buffer at one time.82 /// @param buffer_size The max number of samples to keep in the buffer at one time.
83 AudioReaderSource(ReaderBase *audio_reader, int64 starting_frame_number, int buffer_size);83 AudioReaderSource(ReaderBase *audio_reader, ::int64 starting_frame_number, int buffer_size);
8484
85 /// Destructor85 /// Destructor
86 ~AudioReaderSource();86 ~AudioReaderSource();
@@ -134,7 +134,7 @@
134 ReaderBase* Reader() const { return reader; }134 ReaderBase* Reader() const { return reader; }
135135
136 /// Seek to a specific frame136 /// Seek to a specific frame
137 void Seek(int64 new_position) { frame_number = new_position; estimated_frame = new_position; }137 void Seek(::int64 new_position) { frame_number = new_position; estimated_frame = new_position; }
138138
139 };139 };
140140
141141
=== modified file 'include/FFmpegWriter.h'
--- include/FFmpegWriter.h 2016-09-01 04:57:06 +0000
+++ include/FFmpegWriter.h 2016-10-16 19:11:23 +0000
@@ -147,8 +147,8 @@
147 int cache_size;147 int cache_size;
148 bool is_writing;148 bool is_writing;
149 bool is_open;149 bool is_open;
150 int64 write_video_count;150 ::int64 write_video_count;
151 int64 write_audio_count;151 ::int64 write_audio_count;
152152
153 bool prepare_streams;153 bool prepare_streams;
154 bool write_header;154 bool write_header;
155155
=== modified file 'include/Frame.h'
--- include/Frame.h 2016-09-09 03:33:09 +0000
+++ include/Frame.h 2016-10-16 19:11:23 +0000
@@ -226,7 +226,7 @@
226 juce::AudioSampleBuffer *GetAudioSampleBuffer();226 juce::AudioSampleBuffer *GetAudioSampleBuffer();
227227
228 /// Get the size in bytes of this frame (rough estimate)228 /// Get the size in bytes of this frame (rough estimate)
229 int64 GetBytes();229 ::int64 GetBytes();
230230
231 /// Get pointer to Qt QImage image object231 /// Get pointer to Qt QImage image object
232 tr1::shared_ptr<QImage> GetImage();232 tr1::shared_ptr<QImage> GetImage();
233233
=== modified file 'src/Color.cpp'
--- src/Color.cpp 2015-10-01 23:51:59 +0000
+++ src/Color.cpp 2016-10-16 19:11:23 +0000
@@ -68,7 +68,7 @@
68 int b = blue.GetInt(frame_number);68 int b = blue.GetInt(frame_number);
69 int a = alpha.GetInt(frame_number);69 int a = alpha.GetInt(frame_number);
7070
71 return QColor( r,g,b,a ).name().toStdString();71 return QColor( r,g,b,a ).name(QColor::HexArgb).toStdString();
72}72}
7373
74// Get the distance between 2 RGB pairs (alpha is ignored)74// Get the distance between 2 RGB pairs (alpha is ignored)

Subscribers

People subscribed via source and target branches