John Preston
|
e616c39608
|
Merge branch 'dev' into player
Conflicts:
Telegram/SourceFiles/application.cpp
Telegram/SourceFiles/core/utils.h
Telegram/SourceFiles/localstorage.cpp
Telegram/SourceFiles/pspecific_mac_p.mm
|
2016-10-08 12:10:33 +03:00 |
|
John Preston
|
acbaf83442
|
Disabling playback seeking in new media player when loading audio.
|
2016-09-30 21:10:54 +03:00 |
|
John Preston
|
325e28f3a8
|
Fixed bad time displaying when seeking in the new media player.
|
2016-09-29 18:25:17 +03:00 |
|
John Preston
|
903795d0e5
|
Merge branch 'game_media' into player
Conflicts:
Telegram/SourceFiles/application.cpp
Telegram/SourceFiles/inline_bots/inline_bot_layout_internal.cpp
Telegram/SourceFiles/mainwidget.cpp
Telegram/SourceFiles/mainwidget.h
Telegram/SourceFiles/structs.h
|
2016-09-29 00:31:43 +03:00 |
|
John Preston
|
0562024444
|
Merge branch 'master' into player
Conflicts:
Telegram/SourceFiles/core/observer.h
Telegram/SourceFiles/mainwindow.h
Telegram/SourceFiles/media/view/media_clip_playback.cpp
Telegram/SourceFiles/media/view/media_clip_playback.h
|
2016-09-29 00:16:02 +03:00 |
|
John Preston
|
f970ac3163
|
New audio player done (without playlist).
|
2016-09-23 19:04:26 +03:00 |
|
John Preston
|
ce1973fd30
|
New media player layout started.
|
2016-09-17 22:28:33 +03:00 |
|
John Preston
|
50fa8b63c9
|
Software animated play/pause title button ready, icons for it removed.
|
2016-09-16 15:49:36 +03:00 |
|
John Preston
|
298bd2a476
|
New player icons and sources created.
|
2016-09-15 19:32:49 +03:00 |