Merge pull request #43 from wm9/update-to-sdl2-v0.5.0

Update to sdl2 v0.5.0

Author: andelf

Cargo.toml

@@ -14,8 +14,8 @@ path = "src/sdl2_image/lib.rs"
 [dependencies]
 bitflags = "0.1.1"
 libc = "0.1.6"
-sdl2 = "0.4"
-sdl2-sys = "0.4"
+sdl2 = "0.5"
+sdl2-sys = "0.5"
 
 [[bin]]
 name = "demo"

src/demo/video.rs

@@ -2,31 +2,28 @@ use std::path::Path;
 use sdl2;
 use sdl2_image::{self, LoadTexture, INIT_PNG, INIT_JPG};
 use sdl2::event::Event;
-use sdl2::keycode::KeyCode;
+use sdl2::keyboard::Keycode;
 
 pub fn main(png: &Path) {
 
     let mut context = sdl2::init().video().unwrap();
     sdl2_image::init(INIT_PNG | INIT_JPG);
     let window = context.window("rust-sdl2 demo: Video", 800, 600)
       .position_centered()
-      .opengl()
       .build()
       .unwrap();
 
-    let mut renderer = window.renderer().accelerated().build().unwrap();
-    let mut texture = renderer.load_texture(png).unwrap();
+    let mut renderer = window.renderer().software().build().unwrap();
+    let texture = renderer.load_texture(png).unwrap();
 
-    // Draws and shows the loaded texture.
-    let mut drawer = renderer.drawer();
-    drawer.copy(&mut texture, None, None);
-    drawer.present();
+    renderer.copy(&texture, None, None);
+    renderer.present();
 
     'mainloop: loop {
         for event in context.event_pump().poll_iter() {
             match event {
                 Event::Quit{..} |
-                Event::KeyDown {keycode: KeyCode::Escape, ..} =>
+                Event::KeyDown {keycode: Option::Some(Keycode::Escape), ..} =>
                     break 'mainloop,
                 _ => {}
             }