change name - 1

iina · Dec 17, 2016 · d97c4df · d97c4df
1 parent eb6c857
commit d97c4df
Show file tree

Hide file tree

Showing 121 changed files with 90 additions and 90 deletions.
diff --git a/Podfile b/Podfile
@@ -1,13 +1,13 @@
 platform :osx, '10.11'
 
-target 'mpvx' do
+target 'iina' do
 
   use_frameworks!
 
-  # Pods for mpvx
+  # Pods for iina
   pod 'MASPreferences'
 
-  target 'mpvxTests' do
+  target 'iinaTests' do
     inherit! :search_paths
     # Pods for testing
   end

diff --git a/Podfile.lock b/Podfile.lock
@@ -7,6 +7,6 @@ DEPENDENCIES:
 SPEC CHECKSUMS:
   MASPreferences: 7bdcfe891d7840453cf48f95fa866c3e152ace7a
 
-PODFILE CHECKSUM: 30642a165e6ba7e15b3baa9c41855a947bcde5a0
+PODFILE CHECKSUM: 558947d0c433268c19c1e6db7d4ada0fdb6e58c6
 
 COCOAPODS: 1.2.0.beta.1
diff --git a/mpvx.xcodeproj/project.pbxproj → iina.xcodeproj/project.pbxproj b/mpvx.xcodeproj/project.pbxproj → iina.xcodeproj/project.pbxproj
diff --git a/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata b/...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
diff --git a/mpvx.xcworkspace/contents.xcworkspacedata → iina.xcworkspace/contents.xcworkspacedata b/mpvx.xcworkspace/contents.xcworkspacedata → iina.xcworkspace/contents.xcworkspacedata
diff --git a/mpvx/AppData.swift → iina/AppData.swift b/mpvx/AppData.swift → iina/AppData.swift
diff --git a/mpvx/AppDelegate.swift → iina/AppDelegate.swift b/mpvx/AppDelegate.swift → iina/AppDelegate.swift
diff --git a/mpvx/Aspect.swift → iina/Aspect.swift b/mpvx/Aspect.swift → iina/Aspect.swift
diff --git a/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json b/...xcassets/AppIcon.appiconset/Contents.json → ...xcassets/AppIcon.appiconset/Contents.json
diff --git a/...xcassets/AppIcon.appiconset/icon_1024.png → ...xcassets/AppIcon.appiconset/icon_1024.png b/...xcassets/AppIcon.appiconset/icon_1024.png → ...xcassets/AppIcon.appiconset/icon_1024.png
diff --git a/....xcassets/AppIcon.appiconset/icon_128.png → ....xcassets/AppIcon.appiconset/icon_128.png b/....xcassets/AppIcon.appiconset/icon_128.png → ....xcassets/AppIcon.appiconset/icon_128.png
diff --git a/...cassets/AppIcon.appiconset/icon_256-1.png → ...cassets/AppIcon.appiconset/icon_256-1.png b/...cassets/AppIcon.appiconset/icon_256-1.png → ...cassets/AppIcon.appiconset/icon_256-1.png
diff --git a/....xcassets/AppIcon.appiconset/icon_256.png → ....xcassets/AppIcon.appiconset/icon_256.png b/....xcassets/AppIcon.appiconset/icon_256.png → ....xcassets/AppIcon.appiconset/icon_256.png
diff --git a/...xcassets/AppIcon.appiconset/icon_32-1.png → ...xcassets/AppIcon.appiconset/icon_32-1.png b/...xcassets/AppIcon.appiconset/icon_32-1.png → ...xcassets/AppIcon.appiconset/icon_32-1.png
diff --git a/...s.xcassets/AppIcon.appiconset/icon_32.png → ...s.xcassets/AppIcon.appiconset/icon_32.png b/...s.xcassets/AppIcon.appiconset/icon_32.png → ...s.xcassets/AppIcon.appiconset/icon_32.png
diff --git a/...cassets/AppIcon.appiconset/icon_512-1.png → ...cassets/AppIcon.appiconset/icon_512-1.png b/...cassets/AppIcon.appiconset/icon_512-1.png → ...cassets/AppIcon.appiconset/icon_512-1.png
diff --git a/....xcassets/AppIcon.appiconset/icon_512.png → ....xcassets/AppIcon.appiconset/icon_512.png b/....xcassets/AppIcon.appiconset/icon_512.png → ....xcassets/AppIcon.appiconset/icon_512.png
diff --git a/...s.xcassets/AppIcon.appiconset/icon_64.png → ...s.xcassets/AppIcon.appiconset/icon_64.png b/...s.xcassets/AppIcon.appiconset/icon_64.png → ...s.xcassets/AppIcon.appiconset/icon_64.png
diff --git a/mpvx/Assets.xcassets/Contents.json → iina/Assets.xcassets/Contents.json b/mpvx/Assets.xcassets/Contents.json → iina/Assets.xcassets/Contents.json
diff --git a/...cassets/chevron_up.imageset/Contents.json → ...cassets/chevron_up.imageset/Contents.json b/...cassets/chevron_up.imageset/Contents.json → ...cassets/chevron_up.imageset/Contents.json
diff --git a/...assets/chevron_up.imageset/chevron_up.png → ...assets/chevron_up.imageset/chevron_up.png b/...assets/chevron_up.imageset/chevron_up.png → ...assets/chevron_up.imageset/chevron_up.png
diff --git a/...ets.xcassets/minus.imageset/Contents.json → ...ets.xcassets/minus.imageset/Contents.json b/...ets.xcassets/minus.imageset/Contents.json → ...ets.xcassets/minus.imageset/Contents.json
diff --git a/.../Assets.xcassets/minus.imageset/minus.png → .../Assets.xcassets/minus.imageset/minus.png b/.../Assets.xcassets/minus.imageset/minus.png → .../Assets.xcassets/minus.imageset/minus.png
diff --git a/...xcassets/mute-dark.imageset/Contents.json → ...xcassets/mute-dark.imageset/Contents.json b/...xcassets/mute-dark.imageset/Contents.json → ...xcassets/mute-dark.imageset/Contents.json
diff --git a/...xcassets/mute-dark.imageset/mute-dark.png → ...xcassets/mute-dark.imageset/mute-dark.png b/...xcassets/mute-dark.imageset/mute-dark.png → ...xcassets/mute-dark.imageset/mute-dark.png
diff --git a/...sets.xcassets/mute.imageset/Contents.json → ...sets.xcassets/mute.imageset/Contents.json b/...sets.xcassets/mute.imageset/Contents.json → ...sets.xcassets/mute.imageset/Contents.json
diff --git a/mpvx/Assets.xcassets/mute.imageset/mute.png → iina/Assets.xcassets/mute.imageset/mute.png b/mpvx/Assets.xcassets/mute.imageset/mute.png → iina/Assets.xcassets/mute.imageset/mute.png
diff --git a/...cassets/pause-dark.imageset/Contents.json → ...cassets/pause-dark.imageset/Contents.json b/...cassets/pause-dark.imageset/Contents.json → ...cassets/pause-dark.imageset/Contents.json
diff --git a/...assets/pause-dark.imageset/pause-dark.png → ...assets/pause-dark.imageset/pause-dark.png b/...assets/pause-dark.imageset/pause-dark.png → ...assets/pause-dark.imageset/pause-dark.png
diff --git a/...ets.xcassets/pause.imageset/Contents.json → ...ets.xcassets/pause.imageset/Contents.json b/...ets.xcassets/pause.imageset/Contents.json → ...ets.xcassets/pause.imageset/Contents.json
diff --git a/.../Assets.xcassets/pause.imageset/pause.png → .../Assets.xcassets/pause.imageset/pause.png b/.../Assets.xcassets/pause.imageset/pause.png → .../Assets.xcassets/pause.imageset/pause.png
diff --git a/...xcassets/play-dark.imageset/Contents.json → ...xcassets/play-dark.imageset/Contents.json b/...xcassets/play-dark.imageset/Contents.json → ...xcassets/play-dark.imageset/Contents.json
diff --git a/...xcassets/play-dark.imageset/play-dark.png → ...xcassets/play-dark.imageset/play-dark.png b/...xcassets/play-dark.imageset/play-dark.png → ...xcassets/play-dark.imageset/play-dark.png
diff --git a/...sets.xcassets/play.imageset/Contents.json → ...sets.xcassets/play.imageset/Contents.json b/...sets.xcassets/play.imageset/Contents.json → ...sets.xcassets/play.imageset/Contents.json
diff --git a/mpvx/Assets.xcassets/play.imageset/play.png → iina/Assets.xcassets/play.imageset/play.png b/mpvx/Assets.xcassets/play.imageset/play.png → iina/Assets.xcassets/play.imageset/play.png
diff --git a/...sets/playlist-dark.imageset/Contents.json → ...sets/playlist-dark.imageset/Contents.json b/...sets/playlist-dark.imageset/Contents.json → ...sets/playlist-dark.imageset/Contents.json
diff --git a/.../playlist-dark.imageset/playlist-dark.png → .../playlist-dark.imageset/playlist-dark.png b/.../playlist-dark.imageset/playlist-dark.png → .../playlist-dark.imageset/playlist-dark.png
diff --git a/....xcassets/playlist.imageset/Contents.json → ....xcassets/playlist.imageset/Contents.json b/....xcassets/playlist.imageset/Contents.json → ....xcassets/playlist.imageset/Contents.json
diff --git a/...s.xcassets/playlist.imageset/playlist.png → ...s.xcassets/playlist.imageset/playlist.png b/...s.xcassets/playlist.imageset/playlist.png → ...s.xcassets/playlist.imageset/playlist.png
diff --git a/...sets.xcassets/plus.imageset/Contents.json → ...sets.xcassets/plus.imageset/Contents.json b/...sets.xcassets/plus.imageset/Contents.json → ...sets.xcassets/plus.imageset/Contents.json
diff --git a/mpvx/Assets.xcassets/plus.imageset/plus.png → iina/Assets.xcassets/plus.imageset/plus.png b/mpvx/Assets.xcassets/plus.imageset/plus.png → iina/Assets.xcassets/plus.imageset/plus.png
diff --git a/...sets/settings-dark.imageset/Contents.json → ...sets/settings-dark.imageset/Contents.json b/...sets/settings-dark.imageset/Contents.json → ...sets/settings-dark.imageset/Contents.json
diff --git a/.../settings-dark.imageset/settings-dark.png → .../settings-dark.imageset/settings-dark.png b/.../settings-dark.imageset/settings-dark.png → .../settings-dark.imageset/settings-dark.png
diff --git a/....xcassets/settings.imageset/Contents.json → ....xcassets/settings.imageset/Contents.json b/....xcassets/settings.imageset/Contents.json → ....xcassets/settings.imageset/Contents.json
diff --git a/...s.xcassets/settings.imageset/settings.png → ...s.xcassets/settings.imageset/settings.png b/...s.xcassets/settings.imageset/settings.png → ...s.xcassets/settings.imageset/settings.png
diff --git a/...cassets/speed-dark.imageset/Contents.json → ...cassets/speed-dark.imageset/Contents.json b/...cassets/speed-dark.imageset/Contents.json → ...cassets/speed-dark.imageset/Contents.json
diff --git a/...assets/speed-dark.imageset/speed-dark.png → ...assets/speed-dark.imageset/speed-dark.png b/...assets/speed-dark.imageset/speed-dark.png → ...assets/speed-dark.imageset/speed-dark.png
diff --git a/...ets.xcassets/speed.imageset/Contents.json → ...ets.xcassets/speed.imageset/Contents.json b/...ets.xcassets/speed.imageset/Contents.json → ...ets.xcassets/speed.imageset/Contents.json
diff --git a/.../Assets.xcassets/speed.imageset/speed.png → .../Assets.xcassets/speed.imageset/speed.png b/.../Assets.xcassets/speed.imageset/speed.png → .../Assets.xcassets/speed.imageset/speed.png
diff --git a/...assets/speedl-dark.imageset/Contents.json → ...assets/speedl-dark.imageset/Contents.json b/...assets/speedl-dark.imageset/Contents.json → ...assets/speedl-dark.imageset/Contents.json
diff --git a/...sets/speedl-dark.imageset/speedl-dark.png → ...sets/speedl-dark.imageset/speedl-dark.png b/...sets/speedl-dark.imageset/speedl-dark.png → ...sets/speedl-dark.imageset/speedl-dark.png
diff --git a/...ts.xcassets/speedl.imageset/Contents.json → ...ts.xcassets/speedl.imageset/Contents.json b/...ts.xcassets/speedl.imageset/Contents.json → ...ts.xcassets/speedl.imageset/Contents.json
diff --git a/...ssets.xcassets/speedl.imageset/speedl.png → ...ssets.xcassets/speedl.imageset/speedl.png b/...ssets.xcassets/speedl.imageset/speedl.png → ...ssets.xcassets/speedl.imageset/speedl.png
diff --git a/...assets/volume-dark.imageset/Contents.json → ...assets/volume-dark.imageset/Contents.json b/...assets/volume-dark.imageset/Contents.json → ...assets/volume-dark.imageset/Contents.json
diff --git a/...sets/volume-dark.imageset/volume-dark.png → ...sets/volume-dark.imageset/volume-dark.png b/...sets/volume-dark.imageset/volume-dark.png → ...sets/volume-dark.imageset/volume-dark.png
diff --git a/...ts.xcassets/volume.imageset/Contents.json → ...ts.xcassets/volume.imageset/Contents.json b/...ts.xcassets/volume.imageset/Contents.json → ...ts.xcassets/volume.imageset/Contents.json
diff --git a/...ssets.xcassets/volume.imageset/volume.png → ...ssets.xcassets/volume.imageset/volume.png b/...ssets.xcassets/volume.imageset/volume.png → ...ssets.xcassets/volume.imageset/volume.png
diff --git a/mpvx/Base.lproj/MainMenu.xib → iina/Base.lproj/MainMenu.xib b/mpvx/Base.lproj/MainMenu.xib → iina/Base.lproj/MainMenu.xib
diff --git a/mpvx/ChapterTableCellView.swift → iina/ChapterTableCellView.swift b/mpvx/ChapterTableCellView.swift → iina/ChapterTableCellView.swift
diff --git a/mpvx/CharEncoding.swift → iina/CharEncoding.swift b/mpvx/CharEncoding.swift → iina/CharEncoding.swift
diff --git a/mpvx/ControlBarView.swift → iina/ControlBarView.swift b/mpvx/ControlBarView.swift → iina/ControlBarView.swift
diff --git a/mpvx/Error.swift → iina/Error.swift b/mpvx/Error.swift → iina/Error.swift
diff --git a/mpvx/Extensions.swift → iina/Extensions.swift b/mpvx/Extensions.swift → iina/Extensions.swift
diff --git a/mpvx/FixedFontManager.h → iina/FixedFontManager.h b/mpvx/FixedFontManager.h → iina/FixedFontManager.h
diff --git a/mpvx/FixedFontManager.m → iina/FixedFontManager.m b/mpvx/FixedFontManager.m → iina/FixedFontManager.m
diff --git a/mpvx/FlippedView.swift → iina/FlippedView.swift b/mpvx/FlippedView.swift → iina/FlippedView.swift
diff --git a/mpvx/FontPickerWindowController.swift → iina/FontPickerWindowController.swift b/mpvx/FontPickerWindowController.swift → iina/FontPickerWindowController.swift
diff --git a/mpvx/FontPickerWindowController.xib → iina/FontPickerWindowController.xib b/mpvx/FontPickerWindowController.xib → iina/FontPickerWindowController.xib
diff --git a/mpvx/Formatters.swift → iina/Formatters.swift b/mpvx/Formatters.swift → iina/Formatters.swift
diff --git a/mpvx/Info.plist → iina/Info.plist b/mpvx/Info.plist → iina/Info.plist
diff --git a/mpvx/KeyCodeHelper.swift → iina/KeyCodeHelper.swift b/mpvx/KeyCodeHelper.swift → iina/KeyCodeHelper.swift
diff --git a/mpvx/KeyMapping.swift → iina/KeyMapping.swift b/mpvx/KeyMapping.swift → iina/KeyMapping.swift
diff --git a/mpvx/KeyRecordView.swift → iina/KeyRecordView.swift b/mpvx/KeyRecordView.swift → iina/KeyRecordView.swift
diff --git a/mpvx/KeyRecordViewController.swift → iina/KeyRecordViewController.swift b/mpvx/KeyRecordViewController.swift → iina/KeyRecordViewController.swift
diff --git a/mpvx/KeyRecordViewController.xib → iina/KeyRecordViewController.xib b/mpvx/KeyRecordViewController.xib → iina/KeyRecordViewController.xib
diff --git a/mpvx/MPVChapter.swift → iina/MPVChapter.swift b/mpvx/MPVChapter.swift → iina/MPVChapter.swift
diff --git a/mpvx/MPVCommand.swift → iina/MPVCommand.swift b/mpvx/MPVCommand.swift → iina/MPVCommand.swift
diff --git a/mpvx/MPVController.swift → iina/MPVController.swift b/mpvx/MPVController.swift → iina/MPVController.swift
diff --git a/mpvx/MPVEvent.swift → iina/MPVEvent.swift b/mpvx/MPVEvent.swift → iina/MPVEvent.swift
diff --git a/mpvx/MPVFilter.swift → iina/MPVFilter.swift b/mpvx/MPVFilter.swift → iina/MPVFilter.swift
diff --git a/mpvx/MPVOption.swift → iina/MPVOption.swift b/mpvx/MPVOption.swift → iina/MPVOption.swift
diff --git a/mpvx/MPVPlaylistItem.swift → iina/MPVPlaylistItem.swift b/mpvx/MPVPlaylistItem.swift → iina/MPVPlaylistItem.swift
diff --git a/mpvx/MPVProperty.swift → iina/MPVProperty.swift b/mpvx/MPVProperty.swift → iina/MPVProperty.swift
diff --git a/mpvx/MPVTrack.swift → iina/MPVTrack.swift b/mpvx/MPVTrack.swift → iina/MPVTrack.swift
diff --git a/mpvx/MainWindowController.swift → iina/MainWindowController.swift b/mpvx/MainWindowController.swift → iina/MainWindowController.swift
diff --git a/mpvx/MainWindowController.xib → iina/MainWindowController.xib b/mpvx/MainWindowController.xib → iina/MainWindowController.xib
diff --git a/mpvx/MenuController.swift → iina/MenuController.swift b/mpvx/MenuController.swift → iina/MenuController.swift
diff --git a/mpvx/OSDMessage.swift → iina/OSDMessage.swift b/mpvx/OSDMessage.swift → iina/OSDMessage.swift
diff --git a/mpvx/Parameter.swift → iina/Parameter.swift b/mpvx/Parameter.swift → iina/Parameter.swift
diff --git a/mpvx/PlaySliderCell.swift → iina/PlaySliderCell.swift b/mpvx/PlaySliderCell.swift → iina/PlaySliderCell.swift
diff --git a/mpvx/PlaybackInfo.swift → iina/PlaybackInfo.swift b/mpvx/PlaybackInfo.swift → iina/PlaybackInfo.swift
diff --git a/mpvx/PlayerCore.swift → iina/PlayerCore.swift b/mpvx/PlayerCore.swift → iina/PlayerCore.swift
diff --git a/mpvx/PlaylistDragDestView.swift → iina/PlaylistDragDestView.swift b/mpvx/PlaylistDragDestView.swift → iina/PlaylistDragDestView.swift
diff --git a/mpvx/PlaylistViewController.swift → iina/PlaylistViewController.swift b/mpvx/PlaylistViewController.swift → iina/PlaylistViewController.swift
diff --git a/mpvx/PlaylistViewController.xib → iina/PlaylistViewController.xib b/mpvx/PlaylistViewController.xib → iina/PlaylistViewController.xib
diff --git a/mpvx/PrefAdvancedViewController.swift → iina/PrefAdvancedViewController.swift b/mpvx/PrefAdvancedViewController.swift → iina/PrefAdvancedViewController.swift
diff --git a/mpvx/PrefAdvancedViewController.xib → iina/PrefAdvancedViewController.xib b/mpvx/PrefAdvancedViewController.xib → iina/PrefAdvancedViewController.xib
diff --git a/mpvx/PrefKeyBindingViewController.swift → iina/PrefKeyBindingViewController.swift b/mpvx/PrefKeyBindingViewController.swift → iina/PrefKeyBindingViewController.swift
diff --git a/mpvx/PrefKeyBindingViewController.xib → iina/PrefKeyBindingViewController.xib b/mpvx/PrefKeyBindingViewController.xib → iina/PrefKeyBindingViewController.xib
diff --git a/mpvx/Preference.swift → iina/Preference.swift b/mpvx/Preference.swift → iina/Preference.swift
diff --git a/mpvx/PreferenceGeneralViewController.swift → iina/PreferenceGeneralViewController.swift b/mpvx/PreferenceGeneralViewController.swift → iina/PreferenceGeneralViewController.swift
diff --git a/mpvx/PreferenceGeneralViewController.xib → iina/PreferenceGeneralViewController.xib b/mpvx/PreferenceGeneralViewController.xib → iina/PreferenceGeneralViewController.xib
diff --git a/mpvx/QuickSettingViewController.swift → iina/QuickSettingViewController.swift b/mpvx/QuickSettingViewController.swift → iina/QuickSettingViewController.swift
diff --git a/mpvx/QuickSettingViewController.xib → iina/QuickSettingViewController.xib b/mpvx/QuickSettingViewController.xib → iina/QuickSettingViewController.xib
diff --git a/mpvx/RoundedColorWell.swift → iina/RoundedColorWell.swift b/mpvx/RoundedColorWell.swift → iina/RoundedColorWell.swift
diff --git a/mpvx/RoundedTextFieldCell.swift → iina/RoundedTextFieldCell.swift b/mpvx/RoundedTextFieldCell.swift → iina/RoundedTextFieldCell.swift
diff --git a/mpvx/SettingsListCellView.swift → iina/SettingsListCellView.swift b/mpvx/SettingsListCellView.swift → iina/SettingsListCellView.swift
diff --git a/mpvx/SlideUpButton.swift → iina/SlideUpButton.swift b/mpvx/SlideUpButton.swift → iina/SlideUpButton.swift
diff --git a/mpvx/StreamReader.swift → iina/StreamReader.swift b/mpvx/StreamReader.swift → iina/StreamReader.swift
diff --git a/mpvx/Utility.swift → iina/Utility.swift b/mpvx/Utility.swift → iina/Utility.swift
diff --git a/mpvx/VideoTime.swift → iina/VideoTime.swift b/mpvx/VideoTime.swift → iina/VideoTime.swift
diff --git a/mpvx/VideoView.swift → iina/VideoView.swift b/mpvx/VideoView.swift → iina/VideoView.swift
diff --git a/mpvx/VideoView_bk.swift → iina/VideoView_bk.swift b/mpvx/VideoView_bk.swift → iina/VideoView_bk.swift
diff --git a/mpvx/VolumeSliderCell.swift → iina/VolumeSliderCell.swift b/mpvx/VolumeSliderCell.swift → iina/VolumeSliderCell.swift
diff --git a/mpvx/config/input.conf → iina/config/input.conf b/mpvx/config/input.conf → iina/config/input.conf
diff --git a/mpvx/fragmentShader.glsl → iina/fragmentShader.glsl b/mpvx/fragmentShader.glsl → iina/fragmentShader.glsl
diff --git a/mpvx/mpvx-Bridging-Header.h → iina/mpvx-Bridging-Header.h b/mpvx/mpvx-Bridging-Header.h → iina/mpvx-Bridging-Header.h
diff --git a/mpvx/scripts/autoload.lua → iina/scripts/autoload.lua b/mpvx/scripts/autoload.lua → iina/scripts/autoload.lua
diff --git a/mpvx/vertexShader.glsl → iina/vertexShader.glsl b/mpvx/vertexShader.glsl → iina/vertexShader.glsl
diff --git a/mpvxTests/Info.plist → iinaTests/Info.plist b/mpvxTests/Info.plist → iinaTests/Info.plist
diff --git a/mpvxTests/mpvxTests.swift → iinaTests/mpvxTests.swift b/mpvxTests/mpvxTests.swift → iinaTests/mpvxTests.swift
@@ -7,9 +7,9 @@
 //
 
 import XCTest
-@testable import mpvx
+@testable import iina
 
-class mpvxTests: XCTestCase {
+class iinaTests: XCTestCase {
 
     override func setUp() {
         super.setUp()