[brasero: 7/18] Move around some MACROS

[Philippe Rouquier <philippr src gnome org>]

commit 4ca5ca905ae554fcd888ef16079c5c1965384422
Author: Philippe Rouquier <prouquier Profs1 rostand clg61 ac-caen fr>
Date:   Thu Apr 30 12:08:23 2009 +0200

    Move around some MACROS
---
 libbrasero-burn/brasero-enums.h        |   13 +++++++++++++
 libbrasero-burn/brasero-filtered-uri.c |    4 ++--
 libbrasero-burn/brasero-track-stream.h |   13 -------------
 3 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/libbrasero-burn/brasero-enums.h b/libbrasero-burn/brasero-enums.h
index 7bdd558..1e2f769 100644
--- a/libbrasero-burn/brasero-enums.h
+++ b/libbrasero-burn/brasero-enums.h
@@ -141,6 +141,19 @@ typedef enum {
 	BRASERO_METADATA_INFO			= 1 << 10
 } BraseroStreamFormat;
 
+#define BRASERO_STREAM_FORMAT_AUDIO(stream_FORMAT)	((stream_FORMAT) & 0x007F)
+#define BRASERO_STREAM_FORMAT_VIDEO(stream_FORMAT)	((stream_FORMAT) & 0x0380)
+
+#define	BRASERO_MIN_STREAM_LENGTH			((gint64) 6 * 1000000000LL)
+#define BRASERO_STREAM_LENGTH(start_MACRO, end_MACRO)					\
+	((end_MACRO) - (start_MACRO) > BRASERO_MIN_STREAM_LENGTH) ?			\
+	((end_MACRO) - (start_MACRO)) : BRASERO_MIN_STREAM_LENGTH
+
+#define BRASERO_STREAM_FORMAT_HAS_VIDEO(format_MACRO)				\
+	 ((format_MACRO) & (BRASERO_VIDEO_FORMAT_UNDEFINED|			\
+	 		    BRASERO_VIDEO_FORMAT_VCD|				\
+	 		    BRASERO_VIDEO_FORMAT_VIDEO_DVD))
+
 typedef enum {
 	BRASERO_IMAGE_FORMAT_NONE = 0,
 	BRASERO_IMAGE_FORMAT_BIN = 1,
diff --git a/libbrasero-burn/brasero-filtered-uri.c b/libbrasero-burn/brasero-filtered-uri.c
index b92a612..0d9b9fa 100644
--- a/libbrasero-burn/brasero-filtered-uri.c
+++ b/libbrasero-burn/brasero-filtered-uri.c
@@ -47,7 +47,7 @@ G_DEFINE_TYPE (BraseroFilteredUri, brasero_filtered_uri, GTK_TYPE_LIST_STORE);
 typedef struct _BraseroFilteredUriPrivate BraseroFilteredUriPrivate;
 struct _BraseroFilteredUriPrivate
 {
-	/* This keeps a record of all URIs that have been filtered/restored by
+	/* This keeps a record of all URIs that have been restored by
 	 * the user despite the filtering rules. */
 	GHashTable *restored;
 };
@@ -100,7 +100,7 @@ brasero_filtered_uri_dont_filter (BraseroFilteredUri *filtered,
 			     (gchar *) uri,
 			     GINT_TO_POINTER (1));
 }
-
+				       
 void
 brasero_filtered_uri_filter (BraseroFilteredUri *filtered,
 			     const gchar *uri,
diff --git a/libbrasero-burn/brasero-track-stream.h b/libbrasero-burn/brasero-track-stream.h
index 3c9aff6..160826e 100644
--- a/libbrasero-burn/brasero-track-stream.h
+++ b/libbrasero-burn/brasero-track-stream.h
@@ -38,19 +38,6 @@
 
 G_BEGIN_DECLS
 
-#define BRASERO_STREAM_FORMAT_AUDIO(stream_FORMAT)	((stream_FORMAT) & 0x007F)
-#define BRASERO_STREAM_FORMAT_VIDEO(stream_FORMAT)	((stream_FORMAT) & 0x0380)
-
-#define	BRASERO_MIN_STREAM_LENGTH			((gint64) 6 * 1000000000LL)
-#define BRASERO_STREAM_LENGTH(start_MACRO, end_MACRO)					\
-	((end_MACRO) - (start_MACRO) > BRASERO_MIN_STREAM_LENGTH) ?			\
-	((end_MACRO) - (start_MACRO)) : BRASERO_MIN_STREAM_LENGTH
-
-#define BRASERO_STREAM_FORMAT_HAS_VIDEO(type_MACRO)				\
-	 ((type_MACRO) & (BRASERO_VIDEO_FORMAT_UNDEFINED|			\
-	 		  BRASERO_VIDEO_FORMAT_VCD|				\
-	 		  BRASERO_VIDEO_FORMAT_VIDEO_DVD))
-
 #define BRASERO_TYPE_TRACK_STREAM             (brasero_track_stream_get_type ())
 #define BRASERO_TRACK_STREAM(obj)             (G_TYPE_CHECK_INSTANCE_CAST ((obj), BRASERO_TYPE_TRACK_STREAM, BraseroTrackStream))
 #define BRASERO_TRACK_STREAM_CLASS(klass)     (G_TYPE_CHECK_CLASS_CAST ((klass), BRASERO_TYPE_TRACK_STREAM, BraseroTrackStreamClass))