Skip to content

Commit bbada84

Browse files
lukasflukasf
authored
Merge pull request #273 from ffmpeginteropx/format-files
2 parents 1a77235 + 37a4789 commit bbada84

File tree

75 files changed

+10708
-10708
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

75 files changed

+10708
-10708
lines changed

‎.editorconfig

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ root = true
77
charset = utf-8
88
indent_style = space
99
indent_size = 4
10-
end_of_line = lf
10+
end_of_line = crlf
1111
trim_trailing_whitespace = true
1212
insert_final_newline = true
1313

‎Samples/MediaPlayerCPP/App.xaml.cpp

+61-61
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
//*****************************************************************************
1+
//*****************************************************************************
22
//
33
// Copyright 2015 Microsoft Corporation
44
//
@@ -46,16 +46,16 @@ using namespace Windows::UI::Xaml::Navigation;
4646
/// </summary>
4747
App::App()
4848
{
49-
InitializeComponent();
50-
Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
49+
InitializeComponent();
50+
Suspending += ref new SuspendingEventHandler(this, &App::OnSuspending);
5151

52-
FFmpegInteropX::FFmpegInteropLogging::SetLogLevel(FFmpegInteropX::LogLevel::Info);
53-
FFmpegInteropX::FFmpegInteropLogging::SetLogProvider(this);
52+
FFmpegInteropX::FFmpegInteropLogging::SetLogLevel(FFmpegInteropX::LogLevel::Info);
53+
FFmpegInteropX::FFmpegInteropLogging::SetLogProvider(this);
5454
}
5555

5656
void App::Log(FFmpegInteropX::LogLevel level, String^ message)
5757
{
58-
OutputDebugString(message->Data());
58+
OutputDebugString(message->Data());
5959
}
6060

6161
/// <summary>
@@ -67,57 +67,57 @@ void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEvent
6767
{
6868

6969
#if _DEBUG
70-
// Show graphics profiling information while debugging.
71-
if (IsDebuggerPresent())
72-
{
73-
// Display the current frame rate counters
74-
DebugSettings->EnableFrameRateCounter = true;
75-
}
70+
// Show graphics profiling information while debugging.
71+
if (IsDebuggerPresent())
72+
{
73+
// Display the current frame rate counters
74+
DebugSettings->EnableFrameRateCounter = true;
75+
}
7676
#endif
7777

78-
auto rootFrame = dynamic_cast<Frame^>(Window::Current->Content);
79-
80-
// Do not repeat app initialization when the Window already has content,
81-
// just ensure that the window is active
82-
if (rootFrame == nullptr)
83-
{
84-
// Create a Frame to act as the navigation context and associate it with
85-
// a SuspensionManager key
86-
rootFrame = ref new Frame();
87-
88-
rootFrame->NavigationFailed += ref new Windows::UI::Xaml::Navigation::NavigationFailedEventHandler(this, &App::OnNavigationFailed);
89-
90-
if (e->PreviousExecutionState == ApplicationExecutionState::Terminated)
91-
{
92-
// TODO: Restore the saved session state only when appropriate, scheduling the
93-
// final launch steps after the restore is complete
94-
95-
}
96-
97-
if (rootFrame->Content == nullptr)
98-
{
99-
// When the navigation stack isn't restored navigate to the first page,
100-
// configuring the new page by passing required information as a navigation
101-
// parameter
102-
rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments);
103-
}
104-
// Place the frame in the current Window
105-
Window::Current->Content = rootFrame;
106-
// Ensure the current window is active
107-
Window::Current->Activate();
108-
}
109-
else
110-
{
111-
if (rootFrame->Content == nullptr)
112-
{
113-
// When the navigation stack isn't restored navigate to the first page,
114-
// configuring the new page by passing required information as a navigation
115-
// parameter
116-
rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments);
117-
}
118-
// Ensure the current window is active
119-
Window::Current->Activate();
120-
}
78+
auto rootFrame = dynamic_cast<Frame^>(Window::Current->Content);
79+
80+
// Do not repeat app initialization when the Window already has content,
81+
// just ensure that the window is active
82+
if (rootFrame == nullptr)
83+
{
84+
// Create a Frame to act as the navigation context and associate it with
85+
// a SuspensionManager key
86+
rootFrame = ref new Frame();
87+
88+
rootFrame->NavigationFailed += ref new Windows::UI::Xaml::Navigation::NavigationFailedEventHandler(this, &App::OnNavigationFailed);
89+
90+
if (e->PreviousExecutionState == ApplicationExecutionState::Terminated)
91+
{
92+
// TODO: Restore the saved session state only when appropriate, scheduling the
93+
// final launch steps after the restore is complete
94+
95+
}
96+
97+
if (rootFrame->Content == nullptr)
98+
{
99+
// When the navigation stack isn't restored navigate to the first page,
100+
// configuring the new page by passing required information as a navigation
101+
// parameter
102+
rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments);
103+
}
104+
// Place the frame in the current Window
105+
Window::Current->Content = rootFrame;
106+
// Ensure the current window is active
107+
Window::Current->Activate();
108+
}
109+
else
110+
{
111+
if (rootFrame->Content == nullptr)
112+
{
113+
// When the navigation stack isn't restored navigate to the first page,
114+
// configuring the new page by passing required information as a navigation
115+
// parameter
116+
rootFrame->Navigate(TypeName(MainPage::typeid), e->Arguments);
117+
}
118+
// Ensure the current window is active
119+
Window::Current->Activate();
120+
}
121121
}
122122

123123
/// <summary>
@@ -129,18 +129,18 @@ void App::OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEvent
129129
/// <param name="e">Details about the suspend request.</param>
130130
void App::OnSuspending(Object^ sender, SuspendingEventArgs^ e)
131131
{
132-
(void) sender; // Unused parameter
133-
(void) e; // Unused parameter
132+
(void)sender; // Unused parameter
133+
(void)e; // Unused parameter
134134

135-
//TODO: Save application state and stop any background activity
135+
//TODO: Save application state and stop any background activity
136136
}
137137

138138
/// <summary>
139139
/// Invoked when Navigation to a certain page fails
140140
/// </summary>
141141
/// <param name="sender">The Frame which failed navigation</param>
142142
/// <param name="e">Details about the navigation failure</param>
143-
void App::OnNavigationFailed(Platform::Object ^sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^e)
143+
void App::OnNavigationFailed(Platform::Object^ sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs^ e)
144144
{
145-
throw ref new FailureException("Failed to load Page " + e->SourcePageType.Name);
146-
}
145+
throw ref new FailureException("Failed to load Page " + e->SourcePageType.Name);
146+
}

‎Samples/MediaPlayerCPP/App.xaml.h

+16-16
Original file line numberDiff line numberDiff line change
@@ -27,23 +27,23 @@
2727

2828
namespace MediaPlayerCPP
2929
{
30-
/// <summary>
31-
/// Provides application-specific behavior to supplement the default Application class.
32-
/// </summary>
33-
ref class App sealed :
34-
public FFmpegInteropX::ILogProvider
35-
{
36-
protected:
37-
virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e) override;
30+
/// <summary>
31+
/// Provides application-specific behavior to supplement the default Application class.
32+
/// </summary>
33+
ref class App sealed :
34+
public FFmpegInteropX::ILogProvider
35+
{
36+
protected:
37+
virtual void OnLaunched(Windows::ApplicationModel::Activation::LaunchActivatedEventArgs^ e) override;
3838

39-
internal:
40-
App();
39+
internal:
40+
App();
4141

42-
public:
43-
virtual void Log(FFmpegInteropX::LogLevel level, Platform::String^ message);
42+
public:
43+
virtual void Log(FFmpegInteropX::LogLevel level, Platform::String^ message);
4444

45-
private:
46-
void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e);
47-
void OnNavigationFailed(Platform::Object ^sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs ^e);
48-
};
45+
private:
46+
void OnSuspending(Platform::Object^ sender, Windows::ApplicationModel::SuspendingEventArgs^ e);
47+
void OnNavigationFailed(Platform::Object^ sender, Windows::UI::Xaml::Navigation::NavigationFailedEventArgs^ e);
48+
};
4949
}

‎Samples/MediaPlayerCPP/FloatToDoubleConverter.cpp

+4-4
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,12 @@
33

44
Platform::Object^ MediaPlayerCPP::FloatToDoubleConverter::Convert(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language)
55
{
6-
auto box = static_cast<Platform::IBox<float>^>(value);
7-
return ref new Platform::Box<double>(box->Value);
6+
auto box = static_cast<Platform::IBox<float>^>(value);
7+
return ref new Platform::Box<double>(box->Value);
88
}
99

1010
Platform::Object^ MediaPlayerCPP::FloatToDoubleConverter::ConvertBack(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language)
1111
{
12-
auto box = static_cast<Platform::IBox<double>^>(value);
13-
return ref new Platform::Box<float>((float)box->Value);
12+
auto box = static_cast<Platform::IBox<double>^>(value);
13+
return ref new Platform::Box<float>((float)box->Value);
1414
}

‎Samples/MediaPlayerCPP/FloatToDoubleConverter.h

+8-8
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@
33

44
namespace MediaPlayerCPP
55
{
6-
using namespace Windows::UI::Xaml::Data;
6+
using namespace Windows::UI::Xaml::Data;
77

8-
public ref class FloatToDoubleConverter sealed : public IValueConverter
9-
{
10-
public:
8+
public ref class FloatToDoubleConverter sealed : public IValueConverter
9+
{
10+
public:
1111

12-
// Inherited via IValueConverter
13-
virtual Platform::Object^ Convert(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language);
14-
virtual Platform::Object^ ConvertBack(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language);
15-
};
12+
// Inherited via IValueConverter
13+
virtual Platform::Object^ Convert(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language);
14+
virtual Platform::Object^ ConvertBack(Platform::Object^ value, Windows::UI::Xaml::Interop::TypeName targetType, Platform::Object^ parameter, Platform::String^ language);
15+
};
1616
}

0 commit comments

Comments
 (0)