Merge lp:~tintou/audience/remove-gst-0.10 into lp:~audience-members/audience/trunk

[Corentin Noël]

Remove GStreamer 0.10 to keep the code simple

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-01-11 14:55:28 +0000
+++ CMakeLists.txt	2014-05-01 09:17:54 +0000
@@ -6,25 +6,27 @@
 
 project (audience)
 
-set (DATADIR "${CMAKE_INSTALL_PREFIX}/share")
-set (PKGDATADIR "${DATADIR}/audience")
-set (GETTEXT_PACKAGE "audience")
+set (DATADIR ${CMAKE_INSTALL_PREFIX}/share)
+set (PKGDATADIR ${DATADIR}/${CMAKE_PROJECT_NAME})
+set (GETTEXT_PACKAGE ${CMAKE_PROJECT_NAME})
 set (RELEASE_NAME "A modern media player.")
 set (VERSION "0.1")
 set (VERSION_INFO "The Red Comet")
 
+add_definitions (-DGETTEXT_PACKAGE=\"${GETTEXT_PACKAGE}\")
+add_definitions (-w)
+
 # Data
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/16/audience.svg DESTINATION ${DATADIR}/icons/hicolor/16x16/apps/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/24/audience.svg DESTINATION ${DATADIR}/icons/hicolor/24x24/apps/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/32/audience.svg DESTINATION ${DATADIR}/icons/hicolor/32x32/apps/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/48/audience.svg DESTINATION ${DATADIR}/icons/hicolor/48x48/apps/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/64/audience.svg DESTINATION ${DATADIR}/icons/hicolor/64x64/apps/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/128/audience.svg DESTINATION ${DATADIR}/icons/hicolor/128x128/apps/)
-install(FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/audience.desktop DESTINATION ${DATADIR}/applications/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/16/audience.svg DESTINATION ${DATADIR}/icons/hicolor/16x16/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/24/audience.svg DESTINATION ${DATADIR}/icons/hicolor/24x24/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/32/audience.svg DESTINATION ${DATADIR}/icons/hicolor/32x32/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/48/audience.svg DESTINATION ${DATADIR}/icons/hicolor/48x48/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/64/audience.svg DESTINATION ${DATADIR}/icons/hicolor/64x64/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/icons/128/audience.svg DESTINATION ${DATADIR}/icons/hicolor/128x128/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/audience.desktop DESTINATION ${DATADIR}/applications/)
 
 # Configure file
-configure_file (${CMAKE_SOURCE_DIR}/Audience/Config.vala.cmake ${CMAKE_BINARY_DIR}/Audience/Config.vala)
-add_definitions(-DGETTEXT_PACKAGE="audience")
+configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.cmake ${CMAKE_BINARY_DIR}/src/Config.vala)
 
 set (CPACK_PACKAGE_VERSION ${VERSION})
 set (CPACK_SOURCE_GENERATOR "TGZ")
@@ -35,48 +37,42 @@
 add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
 find_package(PkgConfig)
-pkg_check_modules(CLUTTER_GST_1 QUIET clutter-gst-2.0)
-if (CLUTTER_GST_1_FOUND)
-	set(CLUTTER_GST_FLAGS "--define=HAS_CLUTTER_GST_1")
-	set(GST_PACKAGES gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-tag-1.0)
-else (CLUTTER_GST_1_FOUND)
-	set(CLUTTER_GST_FLAGS "")
-	set(GST_PACKAGES gstreamer-0.10 gstreamer-pbutils-0.10 gstreamer-tag-0.10 gstreamer-interfaces-0.10)
-endif (CLUTTER_GST_1_FOUND)
-
-pkg_check_modules(DEPS REQUIRED granite clutter-gtk-1.0 ${GST_PACKAGES})
-
-add_definitions(${DEPS_CFLAGS})
-link_libraries(${DEPS_LIBRARIES})
-link_directories(${DEPS_LIBRARY_DIRS})
-find_package(Vala REQUIRED)
-include(ValaVersion)
+pkg_check_modules(DEPS REQUIRED granite clutter-gtk-1.0 gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-tag-1.0)
+
+add_definitions (${DEPS_CFLAGS})
+link_libraries (${DEPS_LIBRARIES})
+link_directories (${DEPS_LIBRARY_DIRS})
+find_package (Vala REQUIRED)
+include (ValaVersion)
 
 ensure_vala_version("0.16.1" MINIMUM)
 
 include(ValaPrecompile)
 vala_precompile(VALA_C
-    Audience/Audience.vala
-    Audience/Consts.vala
-    Audience/Settings.vala
-    Audience/Utils.vala
-    ${CMAKE_BINARY_DIR}/Audience/Config.vala
-    Audience/Widgets/TagView.vala
-    Audience/Widgets/Button.vala
-    Audience/Widgets/ControlsBar.vala
-    Audience/Widgets/LLabel.vala
-    Audience/Widgets/MediaSlider.vala
-    Audience/Widgets/TopPanel.vala
-    Audience/Widgets/Playlist.vala
-    Audience/Widgets/VideoPlayer.vala
-    Audience/desktop-launcher.vala
+    ${CMAKE_BINARY_DIR}/src/Config.vala
+    src/Audience.vala
+    src/Consts.vala
+    src/Settings.vala
+    src/Utils.vala
+    src/Widgets/TagView.vala
+    src/Widgets/Button.vala
+    src/Widgets/ControlsBar.vala
+    src/Widgets/LLabel.vala
+    src/Widgets/MediaSlider.vala
+    src/Widgets/TopPanel.vala
+    src/Widgets/Playlist.vala
+    src/Widgets/VideoPlayer.vala
+    src/desktop-launcher.vala
 PACKAGES
     granite
     clutter-gtk-1.0
     gdk-x11-3.0
-	${GST_PACKAGES}
+    gstreamer-1.0
+    gstreamer-pbutils-1.0
+    gstreamer-tag-1.0
 OPTIONS
-	${CLUTTER_GST_FLAGS}
+    --enable-experimental
+    --target-glib=2.32
     --thread
     -g
 )
@@ -86,8 +82,8 @@
 add_schema ("data/org.pantheon.audience.gschema.xml")
 
 add_subdirectory (po)
-add_executable(audience ${VALA_C})
-install (TARGETS audience RUNTIME DESTINATION bin)
+add_executable(${CMAKE_PROJECT_NAME} ${VALA_C})
+install (TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION bin)
 
 # uninstall target
 configure_file(

=== renamed directory 'Audience' => 'src'
=== modified file 'src/Utils.vala'
--- Audience/Utils.vala	2014-04-11 00:10:08 +0000
+++ src/Utils.vala	2014-05-01 09:17:54 +0000
@@ -87,15 +87,11 @@
 
 	public static dynamic Gst.Element get_clutter_sink ()
 	{
-#if HAS_CLUTTER_GST_1
 		var sink = Gst.ElementFactory.make ("autocluttersink", "videosink");
 		if (sink == null) {
 			warning ("autocluttersink not available");
 			sink = Gst.ElementFactory.make ("cluttersink", "videosink");
 		}
-#else
-		var sink = Gst.ElementFactory.make ("cluttersink", "videosink");
-#endif
 
 		return sink;
 	}
@@ -256,4 +252,4 @@
 
 
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/MediaSlider.vala'
--- Audience/Widgets/MediaSlider.vala	2013-05-19 17:10:26 +0000
+++ src/Widgets/MediaSlider.vala	2014-05-01 09:17:54 +0000
@@ -46,11 +46,7 @@
             // preview.width is set in VideoPlayer.vala
 
             // connect gstreamer stuff
-#if HAS_CLUTTER_GST_1
             preview_playbin = Gst.ElementFactory.make ("playbin", "play");
-#else
-            preview_playbin = Gst.ElementFactory.make ("playbin2", "play");
-#endif
             preview_playbin.get_bus ().add_signal_watch ();
             preview_playbin.get_bus ().message.connect ((msg) => {
                 switch (msg.type) {
@@ -142,12 +138,7 @@
                 //buffering
                 if (this._buffered != 0.0){
                     int64 duration;
-#if HAS_CLUTTER_GST_1
                     preview_playbin.query_duration (Gst.Format.TIME, out duration);
-#else
-                    var time = Gst.Format.TIME;
-                    preview_playbin.query_duration (ref time, out duration);
-#endif
                     Drawing.cairo_half_pill (ctx, 2, 2,
                         (this._buffered / duration * this.bar.width) - 4, BAR_HEIGHT - 4, Gtk.PositionType.RIGHT);
                     ctx.set_source_rgb (0.6, 0.6, 0.6);
@@ -234,12 +225,7 @@
             }
 
             int64 duration;
-#if HAS_CLUTTER_GST_1
             preview_playbin.query_duration (Gst.Format.TIME, out duration);
-#else
-            var time = Gst.Format.TIME;
-            preview_playbin.query_duration (ref time, out duration);
-#endif
             preview_playbin.seek (1.0, Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.KEY_UNIT,
                 Gst.SeekType.SET, (int64)(progress * duration),
                 Gst.SeekType.NONE, (int64)Gst.CLOCK_TIME_NONE);
@@ -250,4 +236,3 @@
         }
     }
 }
-

=== modified file 'src/Widgets/TagView.vala'
--- Audience/Widgets/TagView.vala	2014-04-10 06:50:38 +0000
+++ src/Widgets/TagView.vala	2014-05-01 09:17:54 +0000
@@ -207,30 +207,18 @@
                 
                 string desc;
                 string readable = null;
-#if HAS_CLUTTER_GST_1
                 tags.get_string (Gst.Tags.LANGUAGE_CODE, out desc);
                 if (desc == null)
                     tags.get_string (Gst.Tags.CODEC, out desc);
-                
+
                 if (desc != null)
                     readable = Gst.Tag.get_language_name (desc);
-#else
-                tags.get_string (Gst.TAG_LANGUAGE_CODE, out desc);
-                if (desc == null)
-                    tags.get_string (Gst.TAG_CODEC, out desc);
-                
-                if (desc != null)
-                    readable = Gst.tag_get_language_name (desc);
-#endif
+
                 if (target == "audio" && desc != null) {
                     this.languages.append (i.to_string (), readable == null ? desc : readable);
                     used ++;
                 } else if (desc != null) {
-#if HAS_CLUTTER_GST_1
                     var language = Gst.Tag.get_language_name (desc);
-#else
-                    var language = Gst.tag_get_language_name (desc);
-#endif
                     this.subtitles.append (i.to_string (), language == null ? desc : language);
                     used ++;
                 }
@@ -259,4 +247,4 @@
             currently_parsing = false;
         }
     }
-}
+}
\ No newline at end of file

=== modified file 'src/Widgets/VideoPlayer.vala'
--- Audience/Widgets/VideoPlayer.vala	2013-12-16 12:20:13 +0000
+++ src/Widgets/VideoPlayer.vala	2014-05-01 09:17:54 +0000
@@ -55,14 +55,8 @@
             get {
                 int64 length, prog;
                 
-#if HAS_CLUTTER_GST_1
                 playbin.query_duration (Gst.Format.TIME, out length);
                 playbin.query_position (Gst.Format.TIME, out prog);
-#else
-                var time = Gst.Format.TIME;
-                playbin.query_duration (ref time, out length);
-                playbin.query_position (ref time, out prog);
-#endif
                 
                 if (length == 0)
                     return 0;
@@ -71,12 +65,7 @@
             }
             set {
                 int64 length;
-#if HAS_CLUTTER_GST_1
                 playbin.query_duration (Gst.Format.TIME, out length);
-#else
-                var time = Gst.Format.TIME;
-                playbin.query_duration (ref time, out length);
-#endif
                 playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE,
                     (int64)(double.max (value, 0.0) * length));
             }
@@ -93,29 +82,17 @@
         
         public string uri {
             owned get {
-#if HAS_CLUTTER_GST_1
                 return playbin.current_uri;
-#else
-                return playbin.uri;
-#endif
             }
             set {
                 if (value == (string)playbin.uri)
                     return;
 
                 try {
-#if HAS_CLUTTER_GST_1
                     var info = new Gst.PbUtils.Discoverer (10 * Gst.SECOND).discover_uri (value);
-#else
-                    var info = new Gst.Discoverer (10 * Gst.SECOND).discover_uri (value);
-#endif
                     var video = info.get_video_streams ();
                     if (video.data != null) {
-#if HAS_CLUTTER_GST_1
                         var video_info = (Gst.PbUtils.DiscovererVideoInfo)video.data;
-#else
-                        var video_info = (Gst.DiscovererVideoInfo)video.data;
-#endif
                         video_width = video_info.get_width ();
                         video_height = video_info.get_height ();
                     }
@@ -232,11 +209,7 @@
             video = new Clutter.Texture ();
             video.reactive = true;
             
-#if HAS_CLUTTER_GST_1
             playbin = Gst.ElementFactory.make ("playbin", "playbin");
-#else
-            playbin = Gst.ElementFactory.make ("playbin2", "playbin");
-#endif
             var video_sink = Audience.get_clutter_sink ();
             video_sink.texture = video;
             
@@ -253,14 +226,8 @@
             });
             Timeout.add (100, () => {
                 int64 length, prog;
-#if HAS_CLUTTER_GST_1
                 playbin.query_position (Gst.Format.TIME, out prog);
                 playbin.query_duration (Gst.Format.TIME, out length);
-#else
-                var format = Gst.Format.TIME;
-                playbin.query_position (ref format, out prog);
-                playbin.query_duration (ref format, out length);
-#endif
                 
                 if (length == 0)
                     return true;
@@ -379,11 +346,7 @@
                     if (msg.get_structure () == null)
                         break;
                     
-#if HAS_CLUTTER_GST_1
                     if (Gst.PbUtils.is_missing_plugin_message (msg)) {
-#else
-                    if (Gst.is_missing_plugin_message (msg)) {
-#endif
                         error ();
                         playbin.set_state (Gst.State.NULL);
                         
@@ -456,12 +419,7 @@
         void apply_subtitles ()
         {
             int64 time;
-#if HAS_CLUTTER_GST_1
             playbin.query_position (Gst.Format.TIME, out time);
-#else
-            var format = Gst.Format.TIME;
-            playbin.query_position (ref format, out time);
-#endif
 
             playbin.get_state (null, null, Gst.CLOCK_TIME_NONE);
 
@@ -548,11 +506,7 @@
     
         void handle_missing_plugin (Gst.Message msg)
         {
-#if HAS_CLUTTER_GST_1
             var detail = Gst.PbUtils.missing_plugin_message_get_description (msg);
-#else
-            var detail = Gst.missing_plugin_message_get_description (msg);
-#endif
             var dlg = new Gtk.Dialog.with_buttons ("Missing plugin", null,
                 Gtk.DialogFlags.MODAL);
             var grid = new Gtk.Grid ();
@@ -574,15 +528,9 @@
 
             dlg.show_all ();
             if (dlg.run () == 0) {
-#if HAS_CLUTTER_GST_1
                 var installer = Gst.PbUtils.missing_plugin_message_get_installer_detail (msg);
                 var context = new Gst.PbUtils.InstallPluginsContext ();
                 Gst.PbUtils.install_plugins_async ({installer}, context,
-#else
-                var installer = Gst.missing_plugin_message_get_installer_detail (msg);
-                var context = new Gst.InstallPluginsContext ();
-                Gst.install_plugins_async ({installer}, context,
-#endif
                 () => { //finished
                     debug ("Finished plugin install\n");
                     Gst.update_registry ();
@@ -645,4 +593,4 @@
             } catch (Error e) { warning (e.message); }
         }
     }
-}
+}
\ No newline at end of file