From 53c536d76d4dbd7d0c181dbb48b5a7245b068ab7 Mon Sep 17 00:00:00 2001 From: John Preston Date: Sun, 24 May 2015 21:39:07 +0300 Subject: [PATCH] libmpg123, libfaad and libmp4ff added to os x build --- Telegram/SourceFiles/audio.cpp | 5 +++-- Telegram/SourceFiles/audio.h | 2 +- Telegram/Telegram.xcodeproj/project.pbxproj | 12 ++++++++++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/Telegram/SourceFiles/audio.cpp b/Telegram/SourceFiles/audio.cpp index f48f01557..21025b973 100644 --- a/Telegram/SourceFiles/audio.cpp +++ b/Telegram/SourceFiles/audio.cpp @@ -987,7 +987,7 @@ trackId(-1), sampleId(0), samplesCount(0) { } uint32 delay = 0; - if (initial && (sample_count < framesize * frameInfo.channels) && (frameInfo.samples > sample_count)) { + if (initial && (sample_count < framesize * uint32(frameInfo.channels)) && (frameInfo.samples > sample_count)) { delay = frameInfo.samples - sample_count; } @@ -1027,7 +1027,8 @@ private: mp4ff_callback_t mp4cb; bool initial, useAacLength; - int32 framesize, timescale; + uint32 framesize; + int32 timescale; int32 trackId, sampleId, samplesCount; int32 getAACTrack() { diff --git a/Telegram/SourceFiles/audio.h b/Telegram/SourceFiles/audio.h index a77c310c5..70aa791e0 100644 --- a/Telegram/SourceFiles/audio.h +++ b/Telegram/SourceFiles/audio.h @@ -36,7 +36,7 @@ enum VoiceMessageState { }; class VoiceMessagesFader; -class VoiceMessagesLoader; +class VoiceMessagesLoaders; class VoiceMessages : public QObject { Q_OBJECT diff --git a/Telegram/Telegram.xcodeproj/project.pbxproj b/Telegram/Telegram.xcodeproj/project.pbxproj index 8de202f74..45b29e6dc 100644 --- a/Telegram/Telegram.xcodeproj/project.pbxproj +++ b/Telegram/Telegram.xcodeproj/project.pbxproj @@ -1768,7 +1768,10 @@ ./../../Libraries/opus/include, ./../../Libraries/opusfile/include, "./../../Libraries/openal-soft/include", + "./../../Libraries/mpg123-1.22.1/src/libmpg123", "./../../Libraries/libexif-0.6.20", + "./../../Libraries/faad2-2.7/include", + "./../../Libraries/faad2-2.7/common/mp4ff", "/usr/local/Qt-5.4.0/include", "/usr/local/Qt-5.4.0/include/QtMultimedia", "/usr/local/Qt-5.4.0/include/QtWidgets", @@ -1857,6 +1860,9 @@ /usr/local/lib/libogg.a, /usr/local/lib/liblzma.a, /usr/local/lib/libexif.a, + /usr/local/lib/libmpg123.a, + /usr/local/lib/libfaad.a, + /usr/local/lib/libmp4ff.a, "../../Libraries/openssl-xcode/libcrypto.a", ); PRODUCT_NAME = Telegram; @@ -1910,7 +1916,10 @@ ./../../Libraries/opus/include, ./../../Libraries/opusfile/include, "./../../Libraries/openal-soft/include", + "./../../Libraries/mpg123-1.22.1/src/libmpg123", "./../../Libraries/libexif-0.6.20", + "./../../Libraries/faad2-2.7/include", + "./../../Libraries/faad2-2.7/common/mp4ff", "/usr/local/Qt-5.4.0/include", "/usr/local/Qt-5.4.0/include/QtMultimedia", "/usr/local/Qt-5.4.0/include/QtWidgets", @@ -1998,6 +2007,9 @@ /usr/local/lib/libogg.a, /usr/local/lib/liblzma.a, /usr/local/lib/libexif.a, + /usr/local/lib/libmpg123.a, + /usr/local/lib/libfaad.a, + /usr/local/lib/libmp4ff.a, "../../Libraries/openssl-xcode/libcrypto.a", ); PRODUCT_NAME = Telegram;