diff --git a/Cartfile b/Cartfile deleted file mode 100644 index 29a5ceb..0000000 --- a/Cartfile +++ /dev/null @@ -1,2 +0,0 @@ -github "mavlink/MAVSDK-Swift" == 0.8.0 -binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/MobileVLCKit.json" == 3.1.4 diff --git a/Cartfile.resolved b/Cartfile.resolved deleted file mode 100644 index 3a95376..0000000 --- a/Cartfile.resolved +++ /dev/null @@ -1,5 +0,0 @@ -binary "https://code.videolan.org/videolan/VLCKit/raw/master/Packaging/MobileVLCKit.json" "3.1.4" -binary "https://s3.eu-central-1.amazonaws.com/dronecode-sdk/backend.json" "0.28.0" -github "ReactiveX/RxSwift" "5.0.1" -github "jonasvautherin/grpc-swift" "820730e24b9cf035b2889b30d2fe87411e041720" -github "mavlink/MAVSDK-Swift" "0.8.0" diff --git a/MAVSDK-Swift-Example/AppDelegate.swift b/MAVSDK-Swift-Example/AppDelegate.swift index ab978aa..1dd2095 100644 --- a/MAVSDK-Swift-Example/AppDelegate.swift +++ b/MAVSDK-Swift-Example/AppDelegate.swift @@ -1,5 +1,6 @@ import UIKit import MAVSDK_Swift +import MavsdkServer var drone: Drone? = Optional.none diff --git a/MAVSDK-Swift-Example/Controllers/CameraActionViewController.swift b/MAVSDK-Swift-Example/Controllers/CameraActionViewController.swift index 8236273..fbf6100 100644 --- a/MAVSDK-Swift-Example/Controllers/CameraActionViewController.swift +++ b/MAVSDK-Swift-Example/Controllers/CameraActionViewController.swift @@ -12,8 +12,6 @@ class CameraActionViewController: UIViewController { @IBOutlet weak var photoIntervalLabel: UIButton! @IBOutlet weak var cameraView: UIView! - var mediaPlayer = VLCMediaPlayer() - override func viewDidLoad() { super.viewDidLoad() @@ -32,24 +30,6 @@ class CameraActionViewController: UIViewController { self.cameraView.backgroundColor = UIColor.lightGray } - override func viewDidAppear(_ animated: Bool) { - super.viewDidAppear(animated) - - // Play example rtsp stream (this works with the Yuneec Mantis Q) - let url = URL(string: "rtsp://192.168.42.1:554/live") - - let media = VLCMedia(url: url!) - media.addOptions([ - "network-caching": 1000, - "rtp-caching": 0, - ]) - mediaPlayer.media = media - mediaPlayer.delegate = self as? VLCMediaPlayerDelegate - mediaPlayer.drawable = self.cameraView - - mediaPlayer.play() - } - @IBAction func capturePicture(_ sender: UIButton) { let myRoutine = drone!.camera.takePhoto() .do(onError: { error in self.feedbackLabel.text = "Photo Capture Failed : \(error.localizedDescription)" }, diff --git a/MAVSDK-Swift-Example/MAVSDK-Swift-Example-Bridging-Header.h b/MAVSDK-Swift-Example/MAVSDK-Swift-Example-Bridging-Header.h deleted file mode 100644 index bd2d107..0000000 --- a/MAVSDK-Swift-Example/MAVSDK-Swift-Example-Bridging-Header.h +++ /dev/null @@ -1,5 +0,0 @@ -// -// Use this file to import your target's public headers that you would like to expose to Swift. -// - -#import "MobileVLCKit/MobileVLCKit.h" diff --git a/MAVSDK-Swift-Example/MobileVLCKit/empty.cpp b/MAVSDK-Swift-Example/MobileVLCKit/empty.cpp deleted file mode 100644 index e584c25..0000000 --- a/MAVSDK-Swift-Example/MobileVLCKit/empty.cpp +++ /dev/null @@ -1,11 +0,0 @@ -// -// empty.cpp -// vlckitSwiftSample -// -// Created by Mark Knapp on 11/18/15. -// Copyright © 2015 Mark Knapp. All rights reserved. -// - -#include "empty.hpp" - -//Necessary in order to build with MobileVLCKit \ No newline at end of file diff --git a/MAVSDK-Swift-Example/MobileVLCKit/empty.hpp b/MAVSDK-Swift-Example/MobileVLCKit/empty.hpp deleted file mode 100644 index 1135ab9..0000000 --- a/MAVSDK-Swift-Example/MobileVLCKit/empty.hpp +++ /dev/null @@ -1,14 +0,0 @@ -// -// empty.hpp -// vlckitSwiftSample -// -// Created by Mark Knapp on 11/18/15. -// Copyright © 2015 Mark Knapp. All rights reserved. -// - -#ifndef empty_hpp -#define empty_hpp - -#include - -#endif /* empty_hpp */