Index: lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/central/flex/VideoRecorder/src/HTTPServices.as,v diff -u -r1.5 -r1.6 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.6 -r1.7 --- lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml 7 May 2009 06:15:48 -0000 1.6 +++ lams_flash/src/central/flex/VideoRecorder/src/VideoRecorder.mxml 8 May 2009 04:03:11 -0000 1.7 @@ -164,16 +164,29 @@ if(allowUseCamera && cam){ videoDisplay.attachCamera(cam); } - // else remove the view camera button - else{ - recordingButtonBox.removeChild(recordingButtonBox.getChildByName("viewCameraButton")); + // if not allowed to record and no cam available or if just no cam available + else if((!allowUseCamera && !cam) || !cam){ + // remove view camera amd show an alert + recordingButtonBox.removeChild(recordingButtonBox.getChildByName("viewCameraButton")); + Alert.show(dictionary.getLabel("videorecorder.camera.not.available")); + } + // just not allowed to record + else if(!allowUseCamera){ + recordingButtonBox.removeChild(recordingButtonBox.getChildByName("viewCameraButton")); + } // if the mic is to be used, set that up mic = VideoDisplayUtil.setupMic(); if(allowUseVoice && mic){ videoDisplay.attachMic(mic); } + // if no mic detected + else if(!mic){ + // pop an alert + Alert.show(dictionary.getLabel("videorecorder.mic.not.available")); + + } // if neither mic or camera are to be used if((!allowUseCamera && !allowUseVoice) || (!cam && !mic)){ 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.5 -r1.6 --- lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml 7 May 2009 06:15:47 -0000 1.5 +++ lams_flash/src/central/flex/VideoRecorderFCKEditor/src/VideoRecorderFCKEditor.mxml 8 May 2009 04:03:11 -0000 1.6 @@ -170,17 +170,27 @@ setWebcamInfo(true); } + // set up camera cam = VideoDisplayUtil.setupCamera(); - mic = VideoDisplayUtil.setupMic(); - + if(cam){ videoDisplay.attachCamera(cam); } - + else{ + Alert.show(dictionary.getLabel("videorecorder.camera.not.available")); + } + + // set up mic + mic = VideoDisplayUtil.setupMic(); + if(mic){ videoDisplay.attachMic(mic); } + else{ + Alert.show(dictionary.getLabel("videorecorder.mic.not.available")); + } + // don't allow recording if neither cam nor mic is enabled if(!mic && !cam){ videoControlBar.recordButton.enabled = false; } @@ -202,17 +212,27 @@ setWebcamInfo(true); } + // set up camera cam = VideoDisplayUtil.setupCamera(); - mic = VideoDisplayUtil.setupMic(); - + if(cam){ videoDisplay.attachCamera(cam); } - + else{ + Alert.show(dictionary.getLabel("videorecorder.camera.not.available")); + } + + // set up mic + mic = VideoDisplayUtil.setupMic(); + if(mic){ videoDisplay.attachMic(mic); } - + else{ + Alert.show(dictionary.getLabel("videorecorder.mic.not.available")); + } + + // don't allow recording if neither cam nor mic is enabled if(!mic && !cam){ videoControlBar.recordButton.enabled = false; } Index: lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/VideoDisplayUtil.as =================================================================== RCS file: /usr/local/cvsroot/lams_flash/src/common/flex/org/lamsfoundation/lams/common/util/VideoDisplayUtil.as,v diff -u -r1.4 -r1.5 Binary files differ