Index: lams_central/web/fckeditor/editor/plugins/videorecorder/VideoRecorderFCKEditor.swf =================================================================== RCS file: /usr/local/cvsroot/lams_central/web/fckeditor/editor/plugins/videorecorder/Attic/VideoRecorderFCKEditor.swf,v diff -u -r1.3.2.8 -r1.3.2.9 Binary files differ Index: lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml,v diff -u -r1.4.2.3 -r1.4.2.4 --- lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml 20 May 2009 05:47:14 -0000 1.4.2.3 +++ lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml 21 May 2009 02:48:51 -0000 1.4.2.4 @@ -175,15 +175,16 @@ // if the mic is to be used, set that up mic = VideoDisplayUtil.setupMic(); - if(!checkCamera() || !checkMic()) { - if((!allowUseCamera && !allowUseVoice) || (!cam && !mic)) { + checkCamera(); + checkMic(); + + if((!allowUseCamera && !allowUseVoice) || (!cam && !mic)) { // remove recording button removeChild(getChildByName("recordingBox")); // stretch the video list videoList.setStyle("bottom", 10); videoList.invalidateList(); - } } // if first time using video recorder, pop flash settings Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/HTTPServices.as,v diff -u -r1.1.2.1 -r1.1.2.2 Binary files differ Index: lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml,v diff -u -r1.3.2.3 -r1.3.2.4 --- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml 20 May 2009 05:44:33 -0000 1.3.2.3 +++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml 21 May 2009 02:48:51 -0000 1.3.2.4 @@ -82,10 +82,10 @@ // for testing purposes (when running in debug) if(mode == null){ - red5ServerUrl = new String("rtmp://172.20.100.22/"); - serverUrl = new String("http://172.20.100.220:8080/lams/"); + red5ServerUrl = new String("rtmp://localhost/"); + serverUrl = new String("http://localhost:8080/lams/"); mode = new String("recorderModeAuthor"); - toolContentId = 24; + toolContentId = 1; } } @@ -187,11 +187,12 @@ // set up mic mic = VideoDisplayUtil.setupMic(); - if(!checkCamera() || !checkMic()) { - // don't allow recording if neither cam nor mic is enabled - if(!mic && !cam){ - videoControlBar.recordButton.enabled = false; - } + checkCamera() + checkMic(); + + // don't allow recording if neither cam nor mic is enabled + if(!mic && !cam){ + videoControlBar.recordButton.enabled = false; } if(alertCount <= 0) createConnection(); @@ -218,13 +219,14 @@ // set up mic mic = VideoDisplayUtil.setupMic(); - if(!checkCamera() || !checkMic()) { - // don't allow recording if neither cam nor mic is enabled - if(!mic && !cam){ - videoControlBar.recordButton.enabled = false; - } - } + checkCamera() + checkMic(); + // don't allow recording if neither cam nor mic is enabled + if(!mic && !cam){ + videoControlBar.recordButton.enabled = false; + } + if(alertCount <= 0) createConnection(); break; @@ -415,7 +417,8 @@ // if we are in a player online instance if(mode == "playerModeOnline"){ // extension added from fck record - videoDisplay.makeReady(filename, "video", false); + if(mic && !cam) videoDisplay.makeReady(filename, "audio", false); + else videoDisplay.makeReady(filename, "video", false); } // if we are in fck mode else if(mode == "recorderModeFCK"){ @@ -433,7 +436,8 @@ } // change the start recording button's label - videoDisplay.makeReady(filename, "video", offlinePlayback); + if(mic && !cam) videoDisplay.makeReady(filename, "audio", offlinePlayback); + else videoDisplay.makeReady(filename, "video", offlinePlayback); // update tooltip videoControlBar.recordButton.toolTip = dictionary.getLabel("videorecorder.tooltip.start.recording.again"); @@ -592,7 +596,8 @@ Alert.show(dictionary.getLabel("videorecorder.recording.complete.fck")); // play the movie from the Red5 server - videoDisplay.makeReady(filename, "video", offlinePlayback); + if(mic && !cam) videoDisplay.makeReady(filename, "audio", false); + else videoDisplay.makeReady(filename, "video", false); // change the panel status videoDisplayPanel.status = dictionary.getLabel("videorecorder.ready"); Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml,v diff -u -r1.4.2.3 -r1.4.2.4 --- lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml 19 May 2009 05:10:43 -0000 1.4.2.3 +++ lams_flash/src/common/flex/org/lamsfoundation/lams/common/ui/components/VideoDisplay.mxml 21 May 2009 02:48:51 -0000 1.4.2.4 @@ -464,6 +464,11 @@ publishHelper(takeScreenshot); } else{ + if(_mic && !_cam){ + //change the view stack + selectedChild = audioView; + } + // just start publishing publishHelper(takeScreenshot); } Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java,v diff -u -r1.3.4.4 -r1.3.4.5 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java 7 May 2009 06:54:48 -0000 1.3.4.4 +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/model/VideoRecorderRecording.java 21 May 2009 02:40:13 -0000 1.3.4.5 @@ -105,7 +105,7 @@ this.description = recording.description; this.rating = recording.rating; this.isLocal = recording.isLocal; - this.isJustSound = false; + this.isJustSound = recording.isJustSound; this.ratings = null; this.comments = null; this.filename = recording.filename; Index: lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java,v diff -u -r1.1.2.2 -r1.1.2.3 --- lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java 7 May 2009 06:54:50 -0000 1.1.2.2 +++ lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/VideoRecorderAction.java 21 May 2009 02:40:13 -0000 1.1.2.3 @@ -209,13 +209,12 @@ videoRecording.setFilename(filename); videoRecording.setRating((float)rating); videoRecording.setCreateDate(new Date()); - videoRecording.setIsJustSound(isJustSound); videoRecording.setIsLocal(isLocal); videoRecording.setRatings(null); videoRecording.setComments(null); videoRecording.setCreateBy(null); videoRecording.setToolContentId(toolContentId); - } + } } } @@ -245,8 +244,11 @@ else{ videoRecording = videoRecorderService.getRecordingById(recordingId); } - } + } + // reset if sound only + videoRecording.setIsJustSound(isJustSound); + // add the last common information videoRecording.setUpdateDate(new Date()); videoRecording.setTitle(title); Index: lams_tool_videorecorder/web/includes/flash/VideoRecorder.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/VideoRecorder.swf,v diff -u -r1.6.2.10 -r1.6.2.11 Binary files differ Index: lams_tool_videorecorder/web/includes/flash/VideoRecorderFCKEditor.swf =================================================================== RCS file: /usr/local/cvsroot/lams_tool_videorecorder/web/includes/flash/VideoRecorderFCKEditor.swf,v diff -u -r1.5.2.9 -r1.5.2.10 Binary files differ