Permalink
Browse files

Merge branch 'master' of github.com:mconf/mconf-mobile

  • Loading branch information...
2 parents 4fe7eda + 11bbc42 commit 3d6bd526c434c7cea1229d727e7b27426663cb39 @alexandrekreis alexandrekreis committed Mar 29, 2012
@@ -74,8 +74,9 @@
<string name="application_on_background">BigBlueButton</string>
<string name="application_on_background_text">O aplicativo ainda está rodando</string>
- <string name="server">Servidor</string>
- <string name="meeting_information">Informações da sala</string>
+ <string name="api_server">Servidor (API)</string>
+ <string name="application_server">Servidor (red5)</string>
+ <string name="meeting_information">Informações da sala</string>
<string name="meeting_id">Identificação da sala</string>
<string name="meeting_message">Mensagem</string>
<string name="start_time">Horário de início</string>
@@ -81,8 +81,9 @@
<string name="back_pressed_action">Which action do you want to take?</string>
<string name="disconnected">You have been disconnected</string>
- <string name="server">Server</string>
- <string name="meeting_information">Meeting information</string>
+ <string name="api_server">Server (API)</string>
+ <string name="application_server">Server (red5)</string>
+ <string name="meeting_information">Meeting information</string>
<string name="meeting_id">Meeting ID</string>
<string name="meeting_message">Meeting message</string>
<string name="start_time">Start time</string>
@@ -122,4 +123,5 @@ This application is an Android implementation of the BigBlueButton client.
<string name="video_initializing">Starting video capture</string>
<string name="video_failed">Video capture failed. Error ${ERROR}</string>
+
</resources>
@@ -57,7 +57,7 @@ public VoiceModule getVoiceModule() {
&& getHandler().getJoinService().getJoinedMeeting().getReturncode().equals("SUCCESS"))
voice = new VoiceModule(this,
getHandler().getJoinService().getJoinedMeeting().getFullname(),
- getHandler().getJoinService().getServerUrl());
+ getHandler().getJoinService().getApplicationService().getServerUrl());
return voice;
}
@@ -324,8 +324,7 @@ private boolean joinAndConnect() {
log.debug("Joining: " + joinUrl);
getBigBlueButton().createJoinService(joinUrl);
- if (getBigBlueButton().getJoinService()!=null&&getBigBlueButton().getJoinService().standardJoin(joinUrl))
- {
+ if (getBigBlueButton().getJoinService() != null && getBigBlueButton().getJoinService().standardJoin(joinUrl) == JoinServiceBase.E_OK) {
username = getBigBlueButton().getJoinService().getJoinedMeeting().getFullname();
// can't access the moderator information from the user module because at this point, the user isn't connected to the meeting yet
// moderator = getBigBlueButton().getUsersModule().getParticipants().get(getBigBlueButton().getMyUserId()).isModerator();
@@ -66,7 +66,8 @@ public void onClick(View v) {
JoinedMeeting joinedMeeting = bigbluebutton.getJoinService().getJoinedMeeting();
if (joinedMeeting != null) {
- meetingAdapter.addSection(context.getResources().getString(R.string.server), bigbluebutton.getJoinService().getServerUrl() + (bigbluebutton.getJoinService().getPort() != 80? ":" + bigbluebutton.getJoinService().getPort(): "" ));
+ meetingAdapter.addSection(context.getResources().getString(R.string.api_server), bigbluebutton.getJoinService().getApiServerUrl() + (bigbluebutton.getJoinService().getPort() != 80? ":" + bigbluebutton.getJoinService().getPort(): "" ));
+ meetingAdapter.addSection(context.getResources().getString(R.string.application_server), bigbluebutton.getJoinService().getApplicationService().getServerUrl());
meetingAdapter.addSection(context.getResources().getString(R.string.meeting_id), joinedMeeting.getConfname());
meetingAdapter.addSection(context.getResources().getString(R.string.voicebridge_number), joinedMeeting.getVoicebridge());
Meeting meeting = bigbluebutton.getJoinService().getMeetingByName(joinedMeeting.getConfname());
@@ -5,7 +5,7 @@
import java.util.List;
import org.mconf.bbb.BigBlueButtonClient;
-import org.mconf.bbb.api.JoinService0Dot8;
+import org.mconf.bbb.api.ApplicationService;
import org.mconf.bbb.video.BbbVideoPublisher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
@@ -98,7 +98,9 @@ public VideoPublish(BigBlueButtonClient context, boolean restartWhenResume, int
public void startPublisher() {
String streamName = width + "x" + height + context.getMyUserId();
- if (context.getJoinService().getClass() == JoinService0Dot8.class)
+ if (context.getJoinService().getApplicationService().getVersion().equals(ApplicationService.VERSION_0_7)) {
+ // do nothing
+ } else
streamName += "-" + new Date().getTime();
videoPublishHandler = new BbbVideoPublisher(context, this, streamName);
videoPublishHandler.start();
@@ -239,7 +241,7 @@ public boolean hasNext() {
@Override
public Video next() {
- if(framesListAvailable && framesList != null){
+ if(framesListAvailable && framesList != null && !framesList.isEmpty()){
return framesList.remove(0);
} else {
Video emptyVideo = new Video();

0 comments on commit 3d6bd52

Please sign in to comment.