openshot.code team mailing list archive

[matt <mbranton@xxxxxxxxx>]

matt has proposed merging lp:~mbranton/libopenshot/int64_fixes into lp:libopenshot.

Requested reviews:
  OpenShot Code (openshot.code)

For more details, see:
https://code.launchpad.net/~mbranton/libopenshot/int64_fixes/+merge/308589

I have namespace collisions with int64 definitions in libopenshot, this prefixes such definitions to refer to the global namespace definition.
-- 
Your team OpenShot Code is requested to review the proposed merge of lp:~mbranton/libopenshot/int64_fixes into lp:libopenshot.

=== 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 @@
 		int speed; /// The speed and direction to playback a reader (1=normal, 2=fast, 3=faster, -1=rewind, etc...)
 
 		ReaderBase *reader; /// The reader to pull samples from
-		int64 original_frame_number; /// The current frame to read from
-		int64 frame_number; /// The current frame number
+		::int64 original_frame_number; /// The current frame to read from
+		::int64 frame_number; /// The current frame number
 		tr1::shared_ptr<Frame> frame; /// The current frame object that is being read
 		int frame_position; /// The position of the current frame's buffer
 		double estimated_frame; /// The estimated frame position of the currently playing buffer
@@ -80,7 +80,7 @@
 		/// @param audio_reader This reader provides constant samples from a ReaderBase derived class
 		/// @param starting_frame_number This is the frame number to start reading samples from the reader.
 		/// @param buffer_size The max number of samples to keep in the buffer at one time.
-		AudioReaderSource(ReaderBase *audio_reader, int64 starting_frame_number, int buffer_size);
+		AudioReaderSource(ReaderBase *audio_reader, ::int64 starting_frame_number, int buffer_size);
 
 		/// Destructor
 		~AudioReaderSource();
@@ -134,7 +134,7 @@
 	    ReaderBase* Reader() const { return reader; }
 
 	    /// Seek to a specific frame
-	    void Seek(int64 new_position) { frame_number = new_position; estimated_frame = new_position; }
+	    void Seek(::int64 new_position) { frame_number = new_position; estimated_frame = new_position; }
 
 	};
 

=== 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 @@
 		int cache_size;
 		bool is_writing;
 		bool is_open;
-		int64 write_video_count;
-		int64 write_audio_count;
+		::int64 write_video_count;
+		::int64 write_audio_count;
 
 		bool prepare_streams;
 		bool write_header;

=== 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 @@
 	    juce::AudioSampleBuffer *GetAudioSampleBuffer();
 
 		/// Get the size in bytes of this frame (rough estimate)
-		int64 GetBytes();
+		::int64 GetBytes();
 
 		/// Get pointer to Qt QImage image object
 		tr1::shared_ptr<QImage> GetImage();

=== 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 @@
 	int b = blue.GetInt(frame_number);
 	int a = alpha.GetInt(frame_number);
 
-	return QColor( r,g,b,a ).name().toStdString();
+	return QColor( r,g,b,a ).name(QColor::HexArgb).toStdString();
 }
 
 // Get the distance between 2 RGB pairs (alpha is ignored)