Skip to content

Commit

Permalink
Merge pull request #490 from UltraStar-Deluxe/remove-ffmpeg
Browse files Browse the repository at this point in the history
Remove ffmpeg
  • Loading branch information
basisbit authored Oct 24, 2024
2 parents 9f9ea94 + c581cc6 commit 5a5f69f
Show file tree
Hide file tree
Showing 27 changed files with 6 additions and 1,198 deletions.

This file was deleted.

This file was deleted.

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -195,22 +195,6 @@ public double PlaybackSpeed
}
}

public RenderTexture FfmpegRenderTexture {
get
{
return currentAudioSupportProvider is FfmpegAudioSupportProvider ffmpegAudioSupportProvider
? ffmpegAudioSupportProvider.FfmpegRenderTexture
: null;
}
set
{
if (currentAudioSupportProvider is FfmpegAudioSupportProvider ffmpegAudioSupportProvider)
{
ffmpegAudioSupportProvider.FfmpegRenderTexture = value;
}
}
}

private float lastApplyPlaybackStateToAudioProviderTimeInSeconds;

private void OnDestroy()
Expand Down
45 changes: 0 additions & 45 deletions UltraStar Play/Assets/Common/Scene/CommonSceneObjects.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -1004,7 +1004,6 @@ Transform:
- {fileID: 1873797141292969039}
- {fileID: 3570172285929320791}
- {fileID: 8951246057956905287}
- {fileID: 1535503042610526989}
- {fileID: 2311127367653777862}
- {fileID: 7657069212502855339}
m_Father: {fileID: 8069444317427349030}
Expand Down Expand Up @@ -9598,50 +9597,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 7858c3b3db034e2aa03cae273cc54e4c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8022432702083802998
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1535503042610526989}
- component: {fileID: 702766123259852127}
m_Layer: 0
m_Name: SongMediaFileConversionManager
m_TagString: MelodyManiaOnly
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1535503042610526989
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8022432702083802998}
serializedVersion: 2
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
m_Father: {fileID: 5483831765678408185}
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &702766123259852127
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 8022432702083802998}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 998caedc1a8d42fb86616e21b51a656a, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &8036134303383211572
GameObject:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@ public List<IBinding> GetBindings()
bb.BindExistingInstance(MicSampleRecorderManager.Instance);
bb.BindExistingInstance(AchievementEventStream.Instance);
bb.BindExistingInstance(WebViewManager.Instance);
bb.BindExistingInstance(SongMediaFileConversionManager.Instance);
bb.BindExistingInstance(ModManager.Instance);
bb.BindExistingInstance(RuntimeUiInspectionManager.Instance);
bb.BindExistingInstance(VlcManager.Instance);
Expand Down
3 changes: 0 additions & 3 deletions UltraStar Play/Assets/Common/SongMediaFileConversion.meta

This file was deleted.

Loading

0 comments on commit 5a5f69f

Please sign in to comment.