Permalink
Browse files

Merge branch 'master' into selector-intrinsic

  • Loading branch information...
2 parents ced4e03 + 4125235 commit 7e1d59c6b7c349121b30fd0c6b83112dc2440a22 @rolfbjarne rolfbjarne committed Feb 7, 2013
@@ -73,7 +73,7 @@ public override void DecoderError (AVAudioPlayer player, NSError error)
if (cbDecoderError != null)
cbDecoderError (player, new AVErrorEventArgs (error));
}
-
+#if !MONOMAC
[Preserve (Conditional = true)]
public override void BeginInterruption (AVAudioPlayer player)
{
@@ -87,7 +87,7 @@ public override void EndInterruption (AVAudioPlayer player)
if (cbEndInterruption != null)
cbEndInterruption (player, EventArgs.Empty);
}
-
+#endif
}
#pragma warning restore 672
@@ -161,7 +161,7 @@ public override void EncoderError (AVAudioRecorder recorder, NSError error)
if (cbEncoderError != null)
cbEncoderError (recorder, new AVErrorEventArgs (error));
}
-
+#if !MONOMAC
[Preserve (Conditional = true)]
public override void BeginInterruption (AVAudioRecorder recorder)
{
@@ -176,7 +176,7 @@ public override void EndInterruption (AVAudioRecorder recorder)
if (cbEndInterruption != null)
cbEndInterruption (recorder, EventArgs.Empty);
}
-
+#endif
}
public partial class AVAudioRecorder {
Oops, something went wrong.

0 comments on commit 7e1d59c

Please sign in to comment.