mia/Aegisub
1
0
Fork 1
Code Issues Pull requests Projects Releases Wiki Activity

Remove agi::vfr::Framerate's explicit swap implementation

Browse source
This commit is contained in:
Thomas Goyne 2015-07-28 13:03:15 -07:00
parent fefa31eb47
commit b0f4c9f1ad
2 changed files with 8 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
libaegisub/common/vfr.cpp
View file

@ -171,14 +171,6 @@ Framerate::Framerate(std::initializer_list<int> timecodes)
SetFromTimecodes(); SetFromTimecodes();
} }
void Framerate::swap(Framerate &right) throw() {
using std::swap;
swap(numerator, right.numerator);
swap(denominator, right.denominator);
swap(last, right.last);
swap(timecodes, right.timecodes);
}
Framerate::Framerate(fs::path const& filename) Framerate::Framerate(fs::path const& filename)
: denominator(default_denominator) : denominator(default_denominator)
{ {

11
libaegisub/include/libaegisub/vfr.h
View file

@ -76,6 +76,14 @@ class Framerate {
/// Set FPS properties from the timecodes vector /// Set FPS properties from the timecodes vector
void SetFromTimecodes(); void SetFromTimecodes();
public: public:
Framerate(Framerate const&) = default;
Framerate& operator=(Framerate const&) = default;
#ifndef _MSC_VER
Framerate(Framerate&&) = default;
Framerate& operator=(Framerate&&) = default;
#endif
/// @brief VFR from timecodes file /// @brief VFR from timecodes file
/// @param filename File with v1 or v2 timecodes /// @param filename File with v1 or v2 timecodes
/// ///
@ -100,9 +108,6 @@ public:
Framerate(std::vector<int> timecodes); Framerate(std::vector<int> timecodes);
Framerate(std::initializer_list<int> timecodes); Framerate(std::initializer_list<int> timecodes);
/// Helper function for the std::swap specialization
void swap(Framerate &right) throw();
/// @brief Get the frame visible at a given time /// @brief Get the frame visible at a given time
/// @param ms Time in milliseconds /// @param ms Time in milliseconds
/// @param type Time mode /// @param type Time mode