Publishing latest changes

googleads · Feb 22, 2016 · d95dfb0 · d95dfb0
1 parent 62c11b8
commit d95dfb0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Objective-C/AdvancedExample/AdvancedExample/VideoViewController.m b/Objective-C/AdvancedExample/AdvancedExample/VideoViewController.m
@@ -6,8 +6,9 @@
 
 // Maps SDK enum to strings for logging.
 const char *AdEventNames[] = {
-    "Ad Break Ready", "All Ads Completed", "Clicked", "Complete", "First Quartile", "Loaded",
-    "Midpoint", "Pause", "Resume", "Skipped", "Started", "Tapped", "Third Quartile",
+    "Ad Break Ready", "Ad Break Ended", "Ad Break Started", "All Ads Completed", "Clicked",
+    "Complete", "First Quartile", "Loaded", "Midpoint", "Pause", "Resume",
+    "Skipped", "Started", "Tapped", "Third Quartile"
 };
 
 typedef enum { PlayButton, PauseButton } PlayButtonType;

diff --git a/Swift/AdvancedExample/AdvancedExample/VideoViewController.swift b/Swift/AdvancedExample/AdvancedExample/VideoViewController.swift
@@ -60,6 +60,8 @@ class VideoViewController: UIViewController, AVPictureInPictureControllerDelegat
 
   let AdEventNames: [IMAAdEventType: String] = [
     IMAAdEventType.AD_BREAK_READY: "Ad Break Ready",
+    IMAAdEventType.AD_BREAK_ENDED: "Ad Break Ended",
+    IMAAdEventType.AD_BREAK_STARTED: "Ad Break Started",
     IMAAdEventType.ALL_ADS_COMPLETED: "All Ads Completed",
     IMAAdEventType.CLICKED: "Clicked",
     IMAAdEventType.COMPLETE: "Complete",
@@ -495,7 +497,8 @@ class VideoViewController: UIViewController, AVPictureInPictureControllerDelegat
     logMessage("AdsManager event \(eventType!)")
     switch (event.type) {
       case IMAAdEventType.LOADED:
-        if (!pictureInPictureController!.pictureInPictureActive) {
+        if (pictureInPictureController == nil ||
+            !pictureInPictureController!.pictureInPictureActive) {
           adsManager.start()
         }
         break