mir/kotatogram-desktop
2
0
Fork 0
mirror of https://github.com/kotatogram/kotatogram-desktop synced 2025-08-31 14:45:14 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/telegramdesktop/tdesktop into dev

Browse Source
This commit is contained in:
John Preston
2014-07-13 13:50:54 +04:00
parent b676158117 7fd819dc0f
commit 8e3ba09047
49 changed files with 3724 additions and 2103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
Telegram/SourceFiles/app.cpp
View File

@@ -23,7 +23,7 @@ Copyright (c) 2014 John Preston, https://tdesktop.com
#include "application.h"
#include "fileuploader.h"
#include "mainwidget.h"
#include <QtMultimedia/QSoundEffect>
//#include <QtMultimedia/QSoundEffect>
#include <libexif/exif-data.h>
namespace {
@@ -61,7 +61,7 @@ namespace {
HistoryItem *hoveredItem = 0, *pressedItem = 0, *hoveredLinkItem = 0, *pressedLinkItem = 0, *contextItem = 0, *mousedItem = 0;
QSoundEffect *newMsgSound = 0;
// QSoundEffect *newMsgSound = 0;
QPixmap *sprite = 0, *emojis = 0;
typedef QMap<uint32, QPixmap> EmojisMap;
@@ -321,7 +321,7 @@ namespace App {
case mtpc_userStatusOnline: data->onlineTill = status->c_userStatusOnline().vexpires.v; break;
}
if (data->contact < 0 && !data->phone.isEmpty() && (data->id & 0xFFFFFFFF) != MTP::authedId()) {
if (data->contact < 0 && !data->phone.isEmpty() && int32(data->id & 0xFFFFFFFF) != MTP::authedId()) {
data->contact = 0;
}
if (data->contact > 0 && !wasContact) {
@@ -1222,11 +1222,11 @@ namespace App {
void initMedia() {
deinitMedia(false);
if (!newMsgSound) {
newMsgSound = new QSoundEffect();
newMsgSound->setSource(QUrl::fromLocalFile(st::newMsgSound));
newMsgSound->setVolume(1);
}
// if (!newMsgSound) {
// newMsgSound = new QSoundEffect();
// newMsgSound->setSource(QUrl::fromLocalFile(st::newMsgSound));
// newMsgSound->setVolume(1);
// }
if (!::sprite) {
::sprite = new QPixmap(st::spriteFile);
@@ -1251,9 +1251,9 @@ namespace App {
if (completely) {
LOG(("Deleting sound.."));
delete newMsgSound;
// delete newMsgSound;
LOG(("Sound deleted!"));
newMsgSound = 0;
// newMsgSound = 0;
delete ::sprite;
::sprite = 0;
@@ -1344,7 +1344,7 @@ namespace App {
}
void playSound() {
if (cSoundNotify() && newMsgSound) newMsgSound->play();
// if (cSoundNotify() && newMsgSound) newMsgSound->play();
}
void writeConfig() {