Skip to content

Commit

Permalink
Minor renames
Browse files Browse the repository at this point in the history
  • Loading branch information
mysteryx93 committed Mar 17, 2017
1 parent 6c953f8 commit 4d4e1e7
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 11 deletions.
9 changes: 0 additions & 9 deletions FFmpeg/MediaInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -10,15 +10,6 @@ namespace EmergenceGuardian.FFmpeg {
/// Provides functions to get information on media files.
/// </summary>
public static class MediaInfo {
/// <summary>
/// Returns all FFmpeg running processes.
/// </summary>
/// <returns>A list of FFmpeg processes.</returns>
public static Process[] GetFFmpegProcesses() {
string ProcessName = Path.GetFileNameWithoutExtension(FFmpegConfig.FFmpegPath);
return Process.GetProcessesByName(ProcessName);
}

/// <summary>
/// Gets file streams information of specified file via FFmpeg.
/// </summary>
Expand Down
4 changes: 2 additions & 2 deletions FFmpeg/MediaMuxer.cs
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,7 @@ public static CompletionStatus Muxe(IEnumerable<FFmpegStream> fileStreams, strin
/// <param name="destination">The destination file.</param>
/// <returns>The process completion status.</returns>
public static CompletionStatus ConcatenateFiles(IEnumerable<string> files, string destination) {
return ConcatenateFiles(files, destination, null);
return Concatenate(files, destination, null);
}

/// <summary>
Expand All @@ -156,7 +156,7 @@ public static CompletionStatus ConcatenateFiles(IEnumerable<string> files, strin
/// <param name="destination">The destination file.</param>
/// <param name="options">The options for starting the process.</param>
/// <returns>The process completion status.</returns>
public static CompletionStatus ConcatenateFiles(IEnumerable<string> files, string destination, ProcessStartOptions options) {
public static CompletionStatus Concatenate(IEnumerable<string> files, string destination, ProcessStartOptions options) {
CompletionStatus Result = CompletionStatus.None;

// Write temp file.
Expand Down

0 comments on commit 4d4e1e7

Please sign in to comment.