Commit 5127119c authored by Guillaume Beraudo's avatar Guillaume Beraudo
Browse files

Merge branch 'dev_conference' of git.linphone.org:linphone-private

Conflicts:
	mediastreamer2
parents 0d814592 03819023
...@@ -157,6 +157,30 @@ int linphone_core_enter_conference(LinphoneCore *lc){ ...@@ -157,6 +157,30 @@ int linphone_core_enter_conference(LinphoneCore *lc){
return 0; return 0;
} }
int linphone_core_add_all_to_conference(LinphoneCore *lc) {return 0;} int linphone_core_add_all_to_conference(LinphoneCore *lc) {
int linphone_core_terminate_conference(LinphoneCore *lc) {return 0;} MSList *calls=lc->calls;
int linphone_core_get_conference_size(LinphoneCore *lc) {return 0;} while (calls) {
LinphoneCall *call=(LinphoneCall*)calls->data;
calls=calls->next;
if (!call->current_params.in_conference) {
linphone_core_add_to_conference(lc, call);
}
}
return 0;
}
int linphone_core_terminate_conference(LinphoneCore *lc) {
MSList *calls=lc->calls;
while (calls) {
LinphoneCall *call=(LinphoneCall*)calls->data;
calls=calls->next;
if (call->current_params.in_conference) {
linphone_core_terminate_call(lc, call);
}
}
return 0;
}
int linphone_core_get_conference_size(LinphoneCore *lc) {
return ms_audio_conference_size(lc->conf_ctx.conf);
}
...@@ -2416,13 +2416,13 @@ int linphone_core_terminate_call(LinphoneCore *lc, LinphoneCall *the_call) ...@@ -2416,13 +2416,13 @@ int linphone_core_terminate_call(LinphoneCore *lc, LinphoneCall *the_call)
* @param lc The LinphoneCore * @param lc The LinphoneCore
**/ **/
int linphone_core_terminate_all_calls(LinphoneCore *lc){ int linphone_core_terminate_all_calls(LinphoneCore *lc){
while(lc->calls) MSList *calls=lc->calls;
{ while(calls) {
LinphoneCall *the_call = lc->calls->data; LinphoneCall *c=(LinphoneCall*)calls->data;
linphone_core_terminate_call(lc,the_call); calls=calls->next;
linphone_core_terminate_call(lc,c);
} }
ms_list_free(lc->calls); return 0;
return -1;
} }
/** /**
......
...@@ -1384,6 +1384,14 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getCallsNb(JNIEnv *env,j ...@@ -1384,6 +1384,14 @@ extern "C" jint Java_org_linphone_core_LinphoneCoreImpl_getCallsNb(JNIEnv *env,j
return ms_list_size(linphone_core_get_calls((LinphoneCore *) pCore)); return ms_list_size(linphone_core_get_calls((LinphoneCore *) pCore));
} }
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_transferCall(JNIEnv *env,jobject thiz,jlong pCore, jlong pCall, jstring jReferTo) {
const char* cReferTo=env->GetStringUTFChars(jReferTo, NULL);
linphone_core_transfer_call((LinphoneCore *) pCore, (LinphoneCall *) pCall, cReferTo);
env->ReleaseStringUTFChars(jReferTo, cReferTo);
}
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_transferCallToAnother(JNIEnv *env,jobject thiz,jlong pCore, jlong pCall, jlong pDestCall) {
linphone_core_transfer_call_to_another((LinphoneCore *) pCore, (LinphoneCall *) pCall, (LinphoneCall *) pDestCall);
}
extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setZrtpSecretsCache(JNIEnv *env,jobject thiz,jlong pCore, jstring jFile) { extern "C" void Java_org_linphone_core_LinphoneCoreImpl_setZrtpSecretsCache(JNIEnv *env,jobject thiz,jlong pCore, jstring jFile) {
if (jFile) { if (jFile) {
......
...@@ -35,12 +35,6 @@ public interface LinphoneCall { ...@@ -35,12 +35,6 @@ public interface LinphoneCall {
static private Vector values = new Vector(); static private Vector values = new Vector();
private final int mValue; private final int mValue;
public final int value() {return mValue;} public final int value() {return mValue;}
public static final int ID_INCOMING_RECEIVED=1;
public static final int ID_OUTGOING_RINGING=4;
public static final int ID_STREAMS_RUNNING=7;
public static final int ID_PAUSED=9;
public static final int ID_CALL_END=13;
public static final int ID_PAUSED_BY_REMOTE=14;
private final String mStringValue; private final String mStringValue;
/** /**
...@@ -50,7 +44,7 @@ public interface LinphoneCall { ...@@ -50,7 +44,7 @@ public interface LinphoneCall {
/** /**
* Incoming call received. * Incoming call received.
*/ */
public final static State IncomingReceived = new State(ID_INCOMING_RECEIVED,"IncomingReceived"); public final static State IncomingReceived = new State(1,"IncomingReceived");
/** /**
* Outgoing call initialiazed. * Outgoing call initialiazed.
*/ */
...@@ -62,7 +56,7 @@ public interface LinphoneCall { ...@@ -62,7 +56,7 @@ public interface LinphoneCall {
/** /**
* Outgoing call ringing. * Outgoing call ringing.
*/ */
public final static State OutgoingRinging = new State(ID_OUTGOING_RINGING,"OutgoingRinging"); public final static State OutgoingRinging = new State(4,"OutgoingRinging");
/** /**
* Outgoing call early media * Outgoing call early media
*/ */
...@@ -74,7 +68,7 @@ public interface LinphoneCall { ...@@ -74,7 +68,7 @@ public interface LinphoneCall {
/** /**
* Streams running * Streams running
*/ */
public final static State StreamsRunning = new State(ID_STREAMS_RUNNING,"StreamsRunning"); public final static State StreamsRunning = new State(7,"StreamsRunning");
/** /**
* Pausing * Pausing
*/ */
...@@ -82,7 +76,7 @@ public interface LinphoneCall { ...@@ -82,7 +76,7 @@ public interface LinphoneCall {
/** /**
* Paused * Paused
*/ */
public final static State Paused = new State(ID_PAUSED,"Paused"); public final static State Paused = new State(9,"Paused");
/** /**
* Resuming * Resuming
*/ */
...@@ -98,12 +92,12 @@ public interface LinphoneCall { ...@@ -98,12 +92,12 @@ public interface LinphoneCall {
/** /**
* Call end * Call end
*/ */
public final static State CallEnd = new State(ID_CALL_END,"CallEnd"); public final static State CallEnd = new State(13,"CallEnd");
/** /**
* Paused by remote * Paused by remote
*/ */
public final static State PausedByRemote = new State(ID_PAUSED_BY_REMOTE,"PausedByRemote"); public final static State PausedByRemote = new State(14,"PausedByRemote");
/** /**
* The call's parameters are updated, used for example when video is asked by remote * The call's parameters are updated, used for example when video is asked by remote
......
...@@ -615,4 +615,8 @@ public interface LinphoneCore { ...@@ -615,4 +615,8 @@ public interface LinphoneCore {
void terminateAllCalls(); void terminateAllCalls();
@SuppressWarnings("unchecked") List getCalls(); @SuppressWarnings("unchecked") List getCalls();
int getCallsNb(); int getCallsNb();
void transferCall(LinphoneCall call, String referTo);
void transferCallToAnother(LinphoneCall callToTransfer, LinphoneCall destination);
} }
mediastreamer2 @ 560d2143
Subproject commit 9e7e1e64ef6287184f8d1642a52e60ad1838b30e Subproject commit 560d2143d79f2f6555eb9c0f84733b5db61c0fa2
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment