Changeset 514 for trunk/platform/generic/wrappers.c

Timestamp:

09/16/08 00:58:42 (5 years ago)

Author:

reyalp

Message:

merged old-trunk 491:502. russian.lng not updated, since it is very out of date in this tree already.

File:

• trunk/platform/generic/wrappers.c (modified) (1 diff)

trunk/platform/generic/wrappers.c

@@ -596 +596 @@
 #endif
 
-#if CAM_CAN_MUTE_MICROPHONE
 int mute_on_zoom(int x){
  static int old_busy=0;
  int busy=zoom_busy||focus_busy;
- if (conf.mute_on_zoom && (old_busy!=busy)) {
-  if (busy) _TurnOffMic(); else _TurnOnMic();
+ if (old_busy!=busy) {
+  if (busy) {
+#if CAM_CAN_MUTE_MICROPHONE
+   if (conf.mute_on_zoom) _TurnOffMic();
+#endif
+   }
+   else {
+#if CAM_CAN_MUTE_MICROPHONE
+  if (conf.mute_on_zoom) _TurnOnMic();
+#endif
+#if CAM_EV_IN_VIDEO
+  if (get_ev_video_avail()) set_ev_video_avail(0);
+#endif
+  }
   old_busy=busy;
  }
  return x; // preserve R0 if called from assembler
 }
-#endif
-