Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
linphone-desktop
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
linphone-desktop
Commits
3bc72a26
Commit
3bc72a26
authored
Apr 06, 2017
by
Ronan Abhamon
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
chore(submodules): update belr
parent
48b0fad9
Changes
12
Show whitespace changes
Inline
Side-by-side
Showing
12 changed files
with
18 additions
and
6 deletions
+18
-6
App.cpp
linphone-desktop/src/app/App.cpp
+2
-0
CallModel.cpp
linphone-desktop/src/components/call/CallModel.cpp
+2
-0
CallModel.hpp
linphone-desktop/src/components/call/CallModel.hpp
+1
-1
Camera.cpp
linphone-desktop/src/components/camera/Camera.cpp
+2
-0
Camera.hpp
linphone-desktop/src/components/camera/Camera.hpp
+1
-1
ChatProxyModel.cpp
linphone-desktop/src/components/chat/ChatProxyModel.cpp
+2
-0
AbstractCodecsModel.cpp
...one-desktop/src/components/codecs/AbstractCodecsModel.cpp
+0
-2
Notifier.cpp
linphone-desktop/src/components/notifier/Notifier.cpp
+2
-0
OwnPresenceModel.cpp
...hone-desktop/src/components/presence/OwnPresenceModel.cpp
+2
-0
AccountSettingsModel.cpp
...-desktop/src/components/settings/AccountSettingsModel.cpp
+2
-0
SipAddressesModel.hpp
...esktop/src/components/sip-addresses/SipAddressesModel.hpp
+1
-1
belr
submodules/belr
+1
-1
No files found.
linphone-desktop/src/app/App.cpp
View file @
3bc72a26
...
...
@@ -60,6 +60,8 @@
#define QML_VIEW_SPLASH_SCREEN "qrc:/ui/views/App/SplashScreen/SplashScreen.qml"
using
namespace
std
;
// =============================================================================
inline
bool
installLocale
(
App
&
app
,
QTranslator
&
translator
,
const
QLocale
&
locale
)
{
...
...
linphone-desktop/src/components/call/CallModel.cpp
View file @
3bc72a26
...
...
@@ -32,6 +32,8 @@
#define AUTO_ANSWER_OBJECT_NAME "auto-answer-timer"
using
namespace
std
;
// =============================================================================
CallModel
::
CallModel
(
shared_ptr
<
linphone
::
Call
>
linphone_call
)
{
...
...
linphone-desktop/src/components/call/CallModel.hpp
View file @
3bc72a26
...
...
@@ -68,7 +68,7 @@ public:
return
m_linphone_call
;
}
static
void
setRecordFile
(
shared_ptr
<
linphone
::
CallParams
>
&
call_params
);
static
void
setRecordFile
(
s
td
::
s
hared_ptr
<
linphone
::
CallParams
>
&
call_params
);
Q_INVOKABLE
void
accept
();
Q_INVOKABLE
void
acceptWithVideo
();
...
...
linphone-desktop/src/components/camera/Camera.cpp
View file @
3bc72a26
...
...
@@ -33,6 +33,8 @@
#define MAX_FPS 30
using
namespace
std
;
// =============================================================================
struct
ContextInfo
{
...
...
linphone-desktop/src/components/camera/Camera.hpp
View file @
3bc72a26
...
...
@@ -52,7 +52,7 @@ private:
bool
m_update_context_info
=
false
;
bool
m_is_preview
=
false
;
shared_ptr
<
linphone
::
Call
>
m_linphone_call
;
s
td
::
s
hared_ptr
<
linphone
::
Call
>
m_linphone_call
;
QQuickWindow
*
m_window
;
};
...
...
linphone-desktop/src/components/chat/ChatProxyModel.cpp
View file @
3bc72a26
...
...
@@ -22,6 +22,8 @@
#include "ChatProxyModel.hpp"
using
namespace
std
;
// =============================================================================
// Fetch the L last filtered chat entries.
...
...
linphone-desktop/src/components/codecs/AbstractCodecsModel.cpp
View file @
3bc72a26
...
...
@@ -20,8 +20,6 @@
* Author: Ronan Abhamon
*/
#include <linphone++/linphone.hh>
#include "../../utils.hpp"
#include "../core/CoreManager.hpp"
...
...
linphone-desktop/src/components/notifier/Notifier.cpp
View file @
3bc72a26
...
...
@@ -53,6 +53,8 @@
#define N_MAX_NOTIFICATIONS 15
#define MAX_TIMEOUT 60000
using
namespace
std
;
// =============================================================================
inline
int
getNotificationSize
(
const
QObject
&
object
,
const
char
*
property
)
{
...
...
linphone-desktop/src/components/presence/OwnPresenceModel.cpp
View file @
3bc72a26
...
...
@@ -27,6 +27,8 @@
#include "OwnPresenceModel.hpp"
using
namespace
std
;
// =============================================================================
Presence
::
PresenceLevel
OwnPresenceModel
::
getPresenceLevel
()
const
{
...
...
linphone-desktop/src/components/settings/AccountSettingsModel.cpp
View file @
3bc72a26
...
...
@@ -27,6 +27,8 @@
#include "AccountSettingsModel.hpp"
using
namespace
std
;
// =============================================================================
QVariantMap
AccountSettingsModel
::
getProxyConfigDescription
(
const
std
::
shared_ptr
<
linphone
::
ProxyConfig
>
&
proxy_config
)
{
...
...
linphone-desktop/src/components/sip-addresses/SipAddressesModel.hpp
View file @
3bc72a26
...
...
@@ -76,7 +76,7 @@ private:
void
handleMessageReceived
(
const
std
::
shared_ptr
<
linphone
::
ChatMessage
>
&
message
);
void
handleCallStateChanged
(
const
std
::
shared_ptr
<
linphone
::
Call
>
&
call
,
linphone
::
CallState
state
);
void
handlePresenceReceived
(
const
QString
&
sip_address
,
const
shared_ptr
<
const
linphone
::
PresenceModel
>
&
presence_model
);
void
handlePresenceReceived
(
const
QString
&
sip_address
,
const
s
td
::
s
hared_ptr
<
const
linphone
::
PresenceModel
>
&
presence_model
);
void
handleAllEntriesRemoved
(
const
QString
&
sip_address
);
void
handleMessageSent
(
const
std
::
shared_ptr
<
linphone
::
ChatMessage
>
&
message
);
...
...
belr
@
0e237fca
Subproject commit
6fcadc1acd8ece08023e011a4ff9987fc5a14c2f
Subproject commit
0e237fca52851df28f2401702fca5d34ed56bd5b
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment