From 93ca75f6cbcf8afdd5bd901dd7dd6ca14cb61663 Mon Sep 17 00:00:00 2001
From: meh <meh@schizofreni.co>
Date: Thu, 28 May 2015 18:15:00 +0200
Subject: [PATCH] format/stream/disposition: change flags API style

---
 src/format/stream/disposition.rs        | 21 +++++++++++++++++++++
 src/format/{stream.rs => stream/mod.rs} | 22 +++-------------------
 2 files changed, 24 insertions(+), 19 deletions(-)
 create mode 100644 src/format/stream/disposition.rs
 rename src/format/{stream.rs => stream/mod.rs} (67%)

diff --git a/src/format/stream/disposition.rs b/src/format/stream/disposition.rs
new file mode 100644
index 0000000..a479393
--- /dev/null
+++ b/src/format/stream/disposition.rs
@@ -0,0 +1,21 @@
+use libc::c_int;
+use ffi::*;
+
+bitflags! {
+	flags Disposition: c_int {
+		const DEFAULT          = AV_DISPOSITION_DEFAULT,
+		const DUB              = AV_DISPOSITION_DUB,
+		const ORIGINAL         = AV_DISPOSITION_ORIGINAL,
+		const COMMENT          = AV_DISPOSITION_COMMENT,
+		const LYRICS           = AV_DISPOSITION_LYRICS,
+		const KARAOKE          = AV_DISPOSITION_KARAOKE,
+		const FORCED           = AV_DISPOSITION_FORCED,
+		const HEARING_IMPAIRED = AV_DISPOSITION_HEARING_IMPAIRED,
+		const VISUAL_IMPAIRED  = AV_DISPOSITION_VISUAL_IMPAIRED,
+		const CLEAN_EFFECTS    = AV_DISPOSITION_CLEAN_EFFECTS,
+		const ATTACHED_PIC     = AV_DISPOSITION_ATTACHED_PIC,
+		const CAPTIONS         = AV_DISPOSITION_CAPTIONS,
+		const DESCRIPTIONS     = AV_DISPOSITION_DESCRIPTIONS,
+		const METADATA         = AV_DISPOSITION_METADATA,
+	}
+}
diff --git a/src/format/stream.rs b/src/format/stream/mod.rs
similarity index 67%
rename from src/format/stream.rs
rename to src/format/stream/mod.rs
index 8106828..4151858 100644
--- a/src/format/stream.rs
+++ b/src/format/stream/mod.rs
@@ -1,3 +1,6 @@
+pub mod disposition;
+pub use self::disposition::Disposition;
+
 use std::marker::PhantomData;
 
 use libc::c_int;
@@ -6,25 +9,6 @@ use ::format;
 use ::codec::{self, packet};
 use ::{Rational, Discard};
 
-bitflags! {
-	flags Disposition: c_int {
-		const DISPOSITION_DEFAULT          = AV_DISPOSITION_DEFAULT,
-		const DISPOSITION_DUB              = AV_DISPOSITION_DUB,
-		const DISPOSITION_ORIGINAL         = AV_DISPOSITION_ORIGINAL,
-		const DISPOSITION_COMMENT          = AV_DISPOSITION_COMMENT,
-		const DISPOSITION_LYRICS           = AV_DISPOSITION_LYRICS,
-		const DISPOSITION_KARAOKE          = AV_DISPOSITION_KARAOKE,
-		const DISPOSITION_FORCED           = AV_DISPOSITION_FORCED,
-		const DISPOSITION_HEARING_IMPAIRED = AV_DISPOSITION_HEARING_IMPAIRED,
-		const DISPOSITION_VISUAL_IMPAIRED  = AV_DISPOSITION_VISUAL_IMPAIRED,
-		const DISPOSITION_CLEAN_EFFECTS    = AV_DISPOSITION_CLEAN_EFFECTS,
-		const DISPOSITION_ATTACHED_PIC     = AV_DISPOSITION_ATTACHED_PIC,
-		const DISPOSITION_CAPTIONS         = AV_DISPOSITION_CAPTIONS,
-		const DISPOSITION_DESCRIPTIONS     = AV_DISPOSITION_DESCRIPTIONS,
-		const DISPOSITION_METADATA         = AV_DISPOSITION_METADATA,
-	}
-}
-
 #[derive(Eq, PartialEq)]
 pub struct Stream<'a> {
 	ptr: *mut AVStream,