RepoMirrors
/
tdesktop
mirror of https://github.com/telegramdesktop/tdesktop
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

libmpg123, libfaad and libmp4ff added to os x build

This commit is contained in:
John Preston 2015-05-24 21:39:07 +03:00
parent e3ab8821b9
commit 53c536d76d
3 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
Telegram/SourceFiles/audio.cpp
View File

@ -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() {

2
Telegram/SourceFiles/audio.h
View File

@ -36,7 +36,7 @@ enum VoiceMessageState {
};
class VoiceMessagesFader;
class VoiceMessagesLoader;
class VoiceMessagesLoaders;
class VoiceMessages : public QObject {
Q_OBJECT

12
Telegram/Telegram.xcodeproj/project.pbxproj
View File

@ -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;