switch to use sdl2::version::Version

src/sdl2_mixer/ffi.rs

@@ -2,12 +2,8 @@
 
 use libc::*;
 use sdl2::rwops::ll::SDL_RWops;
+use sdl2::version::ll::SDL_version;
 
-pub struct SDL_version {
-    pub major: uint8_t,
-    pub minor: uint8_t,
-    pub patch: uint8_t,
-}
 pub type MIX_InitFlags = c_uint;
 pub static MIX_INIT_FLAC: c_uint = 1;
 pub static MIX_INIT_MOD: c_uint = 2;

src/sdl2_mixer/lib.rs

@@ -13,7 +13,6 @@ A binding for SDL2_mixer.
 extern crate libc;
 extern crate sdl2;
 
-use std::fmt;
 use std::default;
 use std::ptr;
 use std::cast;
@@ -23,6 +22,7 @@ use std::ops::BitOr;
 use libc::{c_int, uint16_t, c_double};
 use sdl2::get_error;
 use sdl2::rwops::RWops;
+use sdl2::version::Version;
 
 // Setup linking for all targets.
 #[cfg(target_os="macos")]
@@ -103,34 +103,10 @@ pub static DEFAULT_FREQUENCY : int = 22050;
 pub static MAX_VOLUME : int = 128;
 
 
-/// The version of the libSDL.so that you are linked to
-#[deriving(Eq, Clone)]
-pub struct SDLVersion {
-    pub major: int,
-    pub minor: int,
-    pub patch: int,
-}
-
-impl fmt::Show for SDLVersion {
-    fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
-        write!(f.buf, "{}.{}.{}", self.major, self.minor, self.patch)
-    }
-}
-
-impl SDLVersion {
-    fn from_sdl_version(sv: *ffi::SDL_version) -> SDLVersion {
-        //! Converts a raw *SDL_version to SDLVersion
-        unsafe {
-            let v = *sv;
-            SDLVersion{ major: v.major as int, minor: v.minor as int, patch: v.patch as int }
-        }
-    }
-}
-
-pub fn get_linked_version() -> SDLVersion {
+pub fn get_linked_version() -> Version {
     //! Returns the version of the dynamically linked SDL_mixer library
     unsafe {
-        SDLVersion::from_sdl_version(ffi::Mix_Linked_Version())
+        Version::from_ll(ffi::Mix_Linked_Version())
     }
 }