Skip to content
This repository has been archived by the owner on Sep 16, 2023. It is now read-only.

Commit

Permalink
Don't embed yt-dlp.
Browse files Browse the repository at this point in the history
  • Loading branch information
CarterLi committed Jan 21, 2022
1 parent dda407c commit 160fca8
Show file tree
Hide file tree
Showing 7 changed files with 53 additions and 34 deletions.
12 changes: 12 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,18 @@

* HDR playback

## Planed features

* Danmaku

## About youtube-dl

We no longer embed the outdated youtube-dl. Users must install `yt-dlp` manually for playing network resources.

```sh
$ brew install yt-dlp
```

## Build

```bash
Expand Down
2 changes: 0 additions & 2 deletions deps/executable/youtube-dl

This file was deleted.

2 changes: 0 additions & 2 deletions iina.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,6 @@
845FB0C71D39462E00C011E0 /* ControlBarView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 845FB0C61D39462E00C011E0 /* ControlBarView.swift */; };
8460FBA91D6497490081841B /* PlaylistViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8460FBA71D6497490081841B /* PlaylistViewController.swift */; };
846121BD1F35FCA500ABB39C /* DraggingDetect.swift in Sources */ = {isa = PBXBuildFile; fileRef = 846121BC1F35FCA500ABB39C /* DraggingDetect.swift */; };
8461BA681E4237C7008BB852 /* youtube-dl in Copy Executables */ = {isa = PBXBuildFile; fileRef = 8461BA671E4237C2008BB852 /* youtube-dl */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
8461C52E1D45FFF6006E91FF /* PlaySliderCell.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8461C52D1D45FFF6006E91FF /* PlaySliderCell.swift */; };
8461C5301D462488006E91FF /* VideoTime.swift in Sources */ = {isa = PBXBuildFile; fileRef = 8461C52F1D462488006E91FF /* VideoTime.swift */; };
846352581EEEE11A0043F0CC /* ThumbnailPeekView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 846352571EEEE11A0043F0CC /* ThumbnailPeekView.swift */; };
Expand Down Expand Up @@ -301,7 +300,6 @@
dstSubfolderSpec = 6;
files = (
E3DE8DD31FD848BA0021921C /* iina-cli in Copy Executables */,
8461BA681E4237C7008BB852 /* youtube-dl in Copy Executables */,
);
name = "Copy Executables";
runOnlyForDeploymentPostprocessing = 0;
Expand Down
2 changes: 1 addition & 1 deletion iina/AppData.swift
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ struct AppData {
static let wikiLink = "https://github.com/iina/iina/wiki"
static let websiteLink = "https://iina.io"
static let emailLink = "[email protected]"
static let ytdlHelpLink = "https://github.com/rg3/youtube-dl/blob/master/README.md#readme"
static let ytdlHelpLink = "https://github.com/yt-dlp/yt-dlp#readme"
static let appcastLink = "https://www.iina.io/appcast.xml"
static let appcastBetaLink = "https://www.iina.io/appcast-beta.xml"
static let assrtRegisterLink = "https://secure.assrt.net/user/register.xml?redir=http%3A%2F%2Fassrt.net%2Fusercp.php"
Expand Down
62 changes: 37 additions & 25 deletions iina/Base.lproj/PrefNetworkViewController.xib

Large diffs are not rendered by default.

3 changes: 1 addition & 2 deletions iina/PlayerCore.swift
Original file line number Diff line number Diff line change
Expand Up @@ -339,8 +339,7 @@ class PlayerCore: NSObject {

func startMPV() {
// set path for youtube-dl
let oldPath = String(cString: getenv("PATH")!)
var path = Utility.exeDirURL.path + ":" + oldPath
var path = "/opt/homebrew/bin:/usr/local/bin:" + String(cString: getenv("PATH")!)
if let customYtdlPath = Preference.string(for: .ytdlSearchPath), !customYtdlPath.isEmpty {
path = customYtdlPath + ":" + path
}
Expand Down
4 changes: 2 additions & 2 deletions iina/zh-Hans.lproj/PrefNetworkViewController.strings
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,8 @@
/* Class = "NSTextFieldCell"; title = "Requires restarting IINA to take effect."; ObjectID = "RwW-JS-iTv"; */
"RwW-JS-iTv.title" = "重启 IINA 后生效。";

/* Class = "NSTextFieldCell"; title = "IINA will search youtube-dl in this folder. Restart needed."; ObjectID = "YqE-yV-BvQ"; */
"YqE-yV-BvQ.title" = "IINA 会在此文件夹中搜索 youtube-dl。需要重新启动。";
/* Class = "NSTextFieldCell"; title = "IINA will also search yt-dlp in this folder if provided. Restart needed."; ObjectID = "YqE-yV-BvQ"; */
"YqE-yV-BvQ.title" = "如果提供了此项,IINA 会在此文件夹中搜索 yt-dlp。需要重新启动。";

/* Class = "NSMenuItem"; title = "Auto"; ObjectID = "aNr-lv-K0r"; */
"aNr-lv-K0r.title" = "自动";
Expand Down

0 comments on commit 160fca8

Please sign in to comment.