Merge lp:~tombeckmann/audience/clutter-audience into lp:~audience-members/audience/trunk

[Tom Beckmann]

[Cody Garver (codygarver)]

Tom, the controls should not autohide when no video is being played and when playback is paused. After this, your code will be ready to be merged :)

[lp:~tombeckmann/audience/clutter-audience]

6. By Tom Beckmann on 2012-02-13

Hiding controls only when playing

[Pim Vullers (pimvullers)]

The improved UI looks are really nice. But it seems you've changed quite a lot which has resulted in more differences between your version and trunk. We need to find out the differences such that we do not lose any improvements.

The main thing that I do not like about this request that it is more replacing then merging. Hence I'd like to see this list of differences as a TODO list to properly merge these branches.

Cody and I are both quite busy now, but he said that he'd have a look at this and try to help in the merge process. I'll only have time after this month (that's the deadline of my current project).

To be short... your work is nice and thanks for that, but the change is to big to just merge/replace it at once without a proper review. So we will definitely accept it, but it might need some more tweaks.

[Tom Beckmann (tombeckmann)]

Tell me what you miss from the trunk and I will copy it over and make it work, I think this will be a lot easier since this branch gives a completly new base.
One thing I just noticed is keyboardshortcuts, I will add it soon.

[Cody Garver (codygarver)]

Tom, our main concern is losing our bazaar history. When I get a spare moment I'll attempt to remedy this and send you a tar of a less offensive tree to submit for approval. Until then, continue hacking away on your branch. Pim and I agree that it is truly impressive. I'll try to get your changes merged as soon as humanly possible.

Again, thank you.

[Cody Garver (codygarver)]

Tom, here's a directory that contains an uncommited merge of the original lp:audience and your branch (as of revision 6). http://dl.dropbox.com/u/702059/audience-trying-to-merge.tar.gz

Extract it, cd into it and perform bzr add then commit something like bzr commit -m "Audience meet Clutter"

Then please fix the following issues

* Title should display media title tag and fallback to filename without extension. A few things need to be replaced when using filename for window title, see Audience.vala in lp:audience for what I'm talking about

* Please make the controls bar the same height as the original Audience as well as its buttons

* Until further maturiy, please remove the Granite popup and move its entries to the AppMenu as "Open File", "Open DVD", "Open CD" and "Open Location"

* Remove the About menu so that we save as much space in the AppMenu as possible

* Buttons/labels in the controls need 10px padding between each other

* Please add time remaining directly to the left of the progress scale with a minus sign, for example: -1:07

* Please enable audience to be executed with a URI argument so that the Slingshot entry works. Example tom$ audience /home/tom/video.avi

I apologize for such a long list of demands.

Pim, what am I missing?

[Cody Garver (codygarver)]

Tom, can you think of any way for us to fall back to the previous overlay behavior for users that don't have good systems? The reason I ask is because Xubuntu has show some interest in Audience and the master plan is for us to be an easy default choice for others like Lubuntu and maybe even Ubuntu itself. Thanks so much for your hard work.

[Cody Garver (codygarver)]

Oops, I meant the time remaining countdown should be directly to the RIGHT of the scale.

Also, the size of the window at launch should be 624x352.

[Tom Beckmann (tombeckmann)]

Sorry, I didn't really get the part with the audience-meet-clutter. I should download, extract it, add all the files, commit them and then push to which branch?
The changes won't be a problem, although I would love to keep the PopOver, I hope we can discuss this a bit... I will remove it for now.

[lp:~tombeckmann/audience/clutter-audience]

7. By Tom Beckmann on 2012-02-14

media title is displayed in windowtitle, controls have same height as reference and padding of 10px, remaining time display, starting from commandline with arguments

8. By Tom Beckmann on 2012-02-17

Removed unnecessary coverflow.vala widget, added restart at beginning when pressing play, and (hopefully, couldnt test it) display of hours

[Cody Garver (codygarver)]

Tom, http://dl.dropbox.com/u/702059/trying-to-merge.tar.gz :p

[Cody Garver (codygarver)]

A modified version of these changes has been merged into trunk. Long live Audience.

review: Approve

=== added file 'CMakeLists.txt'
--- CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ CMakeLists.txt	2012-02-17 22:20:22 +0000
@@ -0,0 +1,35 @@
+project (audience)
+cmake_minimum_required (VERSION 2.8)
+cmake_policy (VERSION 2.6)
+list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake/vala)
+enable_testing ()
+list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
+configure_file (${CMAKE_SOURCE_DIR}/src/Config.vala.cmake ${CMAKE_BINARY_DIR}/src/Config.vala)
+add_definitions(-DGETTEXT_PACKAGE="audience")
+find_package(PkgConfig)
+pkg_check_modules(DEPS REQUIRED granite gtk+-3.0 clutter-gtk-1.0 clutter-gst-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.14.0" MINIMUM)
+include(ValaPrecompile)
+vala_precompile(VALA_C
+    src/audience.vala
+    ${CMAKE_BINARY_DIR}/src/Config.vala
+    src/Widgets/tag_view.vala
+    src/Widgets/previewer.vala
+PACKAGES
+    gtk+-3.0
+    granite
+    clutter-gst-1.0
+    clutter-gtk-1.0
+OPTIONS
+    --thread
+)
+add_subdirectory (po)
+add_executable(audience ${VALA_C})
+install (TARGETS audience RUNTIME DESTINATION bin)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/audience.desktop DESTINATION share/applications)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/data/audience.svg DESTINATION share/icons/hicolor/48x48/apps)

=== renamed file 'CMakeLists.txt' => 'CMakeLists.txt.moved'
=== added directory 'cmake'
=== renamed directory 'cmake' => 'cmake.moved'
=== added file 'cmake/FindVala.cmake'
--- cmake/FindVala.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindVala.cmake	2012-02-17 22:20:22 +0000
@@ -0,0 +1,65 @@
+##
+# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of Jakob Westhoff
+##
+
+##
+# Find module for the Vala compiler (valac)
+#
+# This module determines wheter a Vala compiler is installed on the current
+# system and where its executable is.
+#
+# Call the module using "find_package(Vala) from within your CMakeLists.txt.
+#
+# The following variables will be set after an invocation:
+#
+#  VALA_FOUND       Whether the vala compiler has been found or not
+#  VALA_EXECUTABLE  Full path to the valac executable if it has been found
+#  VALA_VERSION     Version number of the available valac
+##
+
+
+# Search for the valac executable in the usual system paths.
+find_program(VALA_EXECUTABLE
+  NAMES valac)
+
+# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
+# Furthermore set VALA_FOUND to TRUE if Vala has been found (aka.
+# VALA_EXECUTABLE is set)
+
+include(FindPackageHandleStandardArgs)
+find_package_handle_standard_args(Vala DEFAULT_MSG VALA_EXECUTABLE)
+
+mark_as_advanced(VALA_EXECUTABLE)
+
+# Determine the valac version
+if(VALA_FOUND)
+    execute_process(COMMAND ${VALA_EXECUTABLE} "--version" 
+                    OUTPUT_VARIABLE "VALA_VERSION")
+    string(REPLACE "Vala" "" "VALA_VERSION" ${VALA_VERSION})
+    string(STRIP ${VALA_VERSION} "VALA_VERSION")
+endif(VALA_FOUND)

=== added file 'cmake/GSettings.cmake'
--- cmake/GSettings.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GSettings.cmake	2012-02-17 22:20:22 +0000
@@ -0,0 +1,42 @@
+# GSettings.cmake, CMake macros written for Marlin, feel free to re-use them.
+
+option (GSETTINGS_LOCALINSTALL "Install GSettings Schemas locally instead of to the GLib prefix" ON)
+
+option (GSETTINGS_COMPILE "Compile GSettings Schemas after installation" ${GSETTINGS_LOCALINSTALL})
+
+if(GSETTINGS_LOCALINSTALL)
+    message(STATUS "GSettings schemas will be installed locally.")
+endif()
+
+if(GSETTINGS_COMPILE)
+    message(STATUS "GSettings shemas will be compiled.")
+endif()
+
+macro(add_schema SCHEMA_NAME)
+
+    set(PKG_CONFIG_EXECUTABLE pkg-config)
+    # Have an option to not install the schema into where GLib is
+    if (GSETTINGS_LOCALINSTALL)
+        SET (GSETTINGS_DIR "${CMAKE_INSTALL_PREFIX}/share/glib-2.0/schemas/")
+    else (GSETTINGS_LOCALINSTALL)
+        execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} glib-2.0 --variable prefix OUTPUT_VARIABLE _glib_prefix OUTPUT_STRIP_TRAILING_WHITESPACE)
+        SET (GSETTINGS_DIR "${_glib_prefix}/share/glib-2.0/schemas/")
+    endif (GSETTINGS_LOCALINSTALL)
+
+    # Run the validator and error if it fails
+    execute_process (COMMAND ${PKG_CONFIG_EXECUTABLE} gio-2.0 --variable glib_compile_schemas  OUTPUT_VARIABLE _glib_comple_schemas OUTPUT_STRIP_TRAILING_WHITESPACE)
+    execute_process (COMMAND ${_glib_comple_schemas} --dry-run --schema-file=${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} ERROR_VARIABLE _schemas_invalid OUTPUT_STRIP_TRAILING_WHITESPACE)
+
+    if (_schemas_invalid)
+      message (SEND_ERROR "Schema validation error: ${_schemas_invalid}")
+    endif (_schemas_invalid)
+
+    # Actually install and recomple schemas
+    message (STATUS "GSettings schemas will be installed into ${GSETTINGS_DIR}")
+    install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/${SCHEMA_NAME} DESTINATION ${GSETTINGS_DIR} OPTIONAL)
+
+    if (GSETTINGS_COMPILE)
+        install (CODE "message (STATUS \"Compiling GSettings schemas\")")
+        install (CODE "execute_process (COMMAND ${_glib_comple_schemas} ${GSETTINGS_DIR})")
+    endif ()
+endmacro()

=== added file 'cmake/ParseArguments.cmake'
--- cmake/ParseArguments.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ParseArguments.cmake	2012-02-17 22:20:22 +0000
@@ -0,0 +1,36 @@
+##
+# This is a helper Macro to parse optional arguments in Macros/Functions
+# It has been taken from the public CMake wiki.  
+# See http://www.cmake.org/Wiki/CMakeMacroParseArguments for documentation and
+# licensing.
+##
+macro(parse_arguments prefix arg_names option_names)
+  set(DEFAULT_ARGS)
+  foreach(arg_name ${arg_names})
+    set(${prefix}_${arg_name})
+  endforeach(arg_name)
+  foreach(option ${option_names})
+    set(${prefix}_${option} FALSE)
+  endforeach(option)
+
+  set(current_arg_name DEFAULT_ARGS)
+  set(current_arg_list)
+  foreach(arg ${ARGN})
+    set(larg_names ${arg_names})
+    list(FIND larg_names "${arg}" is_arg_name)
+    if(is_arg_name GREATER -1)
+      set(${prefix}_${current_arg_name} ${current_arg_list})
+      set(current_arg_name ${arg})
+      set(current_arg_list)
+    else(is_arg_name GREATER -1)
+      set(loption_names ${option_names})
+      list(FIND loption_names "${arg}" is_option)
+      if(is_option GREATER -1)
+	    set(${prefix}_${arg} TRUE)
+      else(is_option GREATER -1)
+	    set(current_arg_list ${current_arg_list} ${arg})
+      endif(is_option GREATER -1)
+    endif(is_arg_name GREATER -1)
+  endforeach(arg)
+  set(${prefix}_${current_arg_name} ${current_arg_list})
+endmacro(parse_arguments)

=== added file 'cmake/README'
--- cmake/README	1970-01-01 00:00:00 +0000
+++ cmake/README	2012-02-17 22:20:22 +0000
@@ -0,0 +1,10 @@
+        Elementary CMake modules
+
+This is a set of CMake modules: Translations, GSettings, and Vala modules.
+
+For all the Vala related modules see README.Vala.rst: 
+    - ParseArguments.cmake
+    - ValaPrecompile.cmake
+    - ValaVersion.cmake
+    - FindVala.cmake
+

=== added file 'cmake/README.Vala.rst'
--- cmake/README.Vala.rst	1970-01-01 00:00:00 +0000
+++ cmake/README.Vala.rst	2012-02-17 22:20:22 +0000
@@ -0,0 +1,173 @@
+==========
+Vala CMake
+==========
+:Author: 
+    Jakob Westhoff
+:Version:
+    Draft
+
+
+Overview
+========
+
+Vala CMake is a collection of macros for the CMake_ build system to allow the
+creation and management of projects developed using the Vala_ programming
+language or its "Genie" flavor (less tested).
+
+
+Installation
+============
+
+To use the Vala macros in your own project you need to copy the macro files to
+an arbitrary folder in your projects directory and reference them in your
+``CMakeLists.txt`` file.
+
+Assuming the macros are stored under ``cmake/vala`` in your projects folder you
+need to add the following information to your base ``CMakeLists.txt``::
+
+    list(APPEND CMAKE_MODULE_PATH 
+        ${CMAKE_SOURCE_DIR}/cmake/vala
+    )
+
+After the new module path as been added you can simply include the provided
+modules or use the provided find routines.
+
+
+Finding Vala
+============
+
+The find module for vala works like any other Find module in CMake.
+You can use it by simply calling the usual ``find_package`` function. Default
+parameters like ``REQUIRED`` and ``QUIETLY`` are supported.
+
+::
+
+    find_package(Vala REQUIRED)
+
+After a successful call to the find_package function the following variables 
+will be set:
+
+VALA_FOUND
+    Whether the vala compiler has been found or not
+
+VALA_EXECUTABLE
+    Full path to the valac executable if it has been found
+
+VALA_VERSION
+    Version number of the available valac
+
+
+Precompiling Vala sources
+=========================
+
+CMake is mainly supposed to handle c or c++ based projects. Luckily every vala
+program is translated into plain c code using the vala compiler, followed by
+normal compilation of the generated c program using gcc.
+
+The macro ``vala_precompile`` uses that fact to create c files from your .vala
+sources for further CMake processing. 
+
+The first parameter provided is a variable, which will be filled with a list of
+c files outputted by the vala compiler. This list can than be used in
+conjunction with functions like ``add_executable`` or others to create the
+necessary compile rules with CMake.
+
+The initial variable is followed by a list of .vala files to be compiled.
+Please take care to add every vala file belonging to the currently compiled
+project or library as Vala will otherwise not be able to resolve all
+dependencies.
+
+The following sections may be specified afterwards to provide certain options
+to the vala compiler:
+
+PACKAGES  
+    A list of vala packages/libraries to be used during the compile cycle. The
+    package names are exactly the same, as they would be passed to the valac
+    "--pkg=" option.
+
+OPTIONS
+    A list of optional options to be passed to the valac executable. This can be
+    used to pass "--thread" for example to enable multi-threading support.
+
+DIRECTORY
+    Specify the directory where the output source files will be stored. If 
+    ommitted, the source files will be stored in CMAKE_CURRENT_BINARY_DIR.
+
+CUSTOM_VAPIS
+    A list of custom vapi files to be included for compilation. This can be
+    useful to include freshly created vala libraries without having to install
+    them in the system.
+
+GENERATE_VAPI
+    Pass all the needed flags to the compiler to create an internal vapi for
+    the compiled library. The provided name will be used for this and a
+    <provided_name>.vapi file will be created.
+
+GENERATE_HEADER
+    Let the compiler generate a header file for the compiled code. There will
+    be a header file as well as an internal header file being generated called
+    <provided_name>.h and <provided_name>_internal.h
+
+The following call is a simple example to the vala_precompile macro showing an
+example to every of the optional sections::
+
+    vala_precompile(VALA_C
+        source1.vala
+        source2.vala
+        source3.vala
+    PACKAGES
+        gtk+-2.0
+        gio-1.0
+        posix
+    OPTIONS
+        --thread
+    CUSTOM_VAPIS
+        some_vapi.vapi
+    GENERATE_VAPI
+        myvapi
+    GENERATE_HEADER
+        myheader
+    )
+
+Most important is the variable VALA_C which will contain all the generated c
+file names after the call. The easiest way to use this information is to tell
+CMake to create an executable out of it.
+
+::
+
+    add_executable(myexecutable ${VALA_C})
+
+
+Further reading
+===============
+
+The `Pdf Presenter Console`__ , which is a vala based project of mine, makes
+heavy usage of the here described macros.  To look at a real world example of
+these macros the mentioned project is the right place to take a look. The svn
+trunk of it can be found at::
+
+	svn://pureenergy.cc/pdf_presenter_console/trunk
+
+
+__ http://westhoffswelt.de/projects/pdf_presenter_console.html
+
+
+Acknowledgments
+===============
+
+Thanks go out to Florian Sowade, a fellow local PHP-Usergroupie, who helped me
+a lot with the initial version of this macros and always answered my mostly
+dumb CMake questions.
+
+.. _CMake: http://cmake.org
+.. _Vala: http://live.gnome.org/Vala
+.. _Genie: http://live.gnome.org/Genie
+
+
+

+..
+   Local Variables:
+   mode: rst
+   fill-column: 79
+   End: 
+   vim: et syn=rst tw=79

=== added file 'cmake/Tests.cmake'
--- cmake/Tests.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Tests.cmake	2012-02-17 22:20:22 +0000
@@ -0,0 +1,5 @@
+# Test macros for Marlin, feel free to re-use them.
+
+macro(add_test_executable EXE_NAME)
+    add_test(${EXE_NAME} gtester ${CMAKE_CURRENT_BINARY_DIR}/${EXE_NAME})
+endmacro()

=== added file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	1970-01-01 00:00:00 +0000
+++ cmake/Translations.cmake	2012-02-17 22:20:22 +0000
@@ -0,0 +1,41 @@
+# Translations.cmake, CMake macros written for Marlin, feel free to re-use them
+
+macro(add_translations_directory NLS_PACKAGE)
+    add_custom_target (i18n ALL COMMENT “Building i18n messages.”)
+    find_program (MSGFMT_EXECUTABLE msgfmt)
+    file (GLOB PO_FILES ${CMAKE_CURRENT_SOURCE_DIR}/*.po)
+    foreach (PO_INPUT ${PO_FILES})
+        get_filename_component (PO_INPUT_BASE ${PO_INPUT} NAME_WE)
+        set (MO_OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/${PO_INPUT_BASE}.mo)
+        add_custom_command (TARGET i18n COMMAND ${MSGFMT_EXECUTABLE} -o ${MO_OUTPUT} ${PO_INPUT})
+
+        install (FILES ${MO_OUTPUT} DESTINATION
+            share/locale/${PO_INPUT_BASE}/LC_MESSAGES
+            RENAME ${NLS_PACKAGE}.mo)
+    endforeach (PO_INPUT ${PO_FILES})
+endmacro(add_translations_directory)
+
+
+macro(add_translations_catalog NLS_PACKAGE)
+    add_custom_target (pot COMMENT “Building translation catalog.”)
+    find_program (XGETTEXT_EXECUTABLE xgettext)
+
+
+    set(C_SOURCE "")
+
+    foreach(FILES_INPUT ${ARGN})
+        file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+        file (GLOB SOURCE_FILES ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT}/*.vala)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+    endforeach()
+
+    add_custom_command (TARGET pot COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE} -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        ${VALA_SOURCE} ${C_SOURCE} --keyword="_" --from-code=UTF-8
+        )
+endmacro()

=== added file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ValaPrecompile.cmake	2012-02-17 22:20:22 +0000
@@ -0,0 +1,187 @@
+##
+# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of Jakob Westhoff
+##
+
+include(ParseArguments)
+find_package(Vala REQUIRED)
+
+##
+# Compile vala files to their c equivalents for further processing. 
+#
+# The "vala_precompile" macro takes care of calling the valac executable on the
+# given source to produce c files which can then be processed further using
+# default cmake functions.
+# 
+# The first parameter provided is a variable, which will be filled with a list
+# of c files outputted by the vala compiler. This list can than be used in
+# conjuction with functions like "add_executable" or others to create the
+# neccessary compile rules with CMake.
+# 
+# The initial variable is followed by a list of .vala files to be compiled.
+# Please take care to add every vala file belonging to the currently compiled
+# project or library as Vala will otherwise not be able to resolve all
+# dependencies.
+# 
+# The following sections may be specified afterwards to provide certain options
+# to the vala compiler:
+# 
+# PACKAGES
+#   A list of vala packages/libraries to be used during the compile cycle. The
+#   package names are exactly the same, as they would be passed to the valac
+#   "--pkg=" option.
+# 
+# OPTIONS
+#   A list of optional options to be passed to the valac executable. This can be
+#   used to pass "--thread" for example to enable multi-threading support.
+#
+# CUSTOM_VAPIS
+#   A list of custom vapi files to be included for compilation. This can be
+#   useful to include freshly created vala libraries without having to install
+#   them in the system.
+#
+# GENERATE_VAPI
+#   Pass all the needed flags to the compiler to create an internal vapi for
+#   the compiled library. The provided name will be used for this and a
+#   <provided_name>.vapi file will be created.
+# 
+# GENERATE_HEADER
+#   Let the compiler generate a header file for the compiled code. There will
+#   be a header file as well as an internal header file being generated called
+#   <provided_name>.h and <provided_name>_internal.h
+#
+# The following call is a simple example to the vala_precompile macro showing
+# an example to every of the optional sections:
+#
+#   vala_precompile(VALA_C
+#       source1.vala
+#       source2.vala
+#       source3.vala
+#   PACKAGES
+#       gtk+-2.0
+#       gio-1.0
+#       posix
+#   DIRECTORY
+#       gen
+#   OPTIONS
+#       --thread
+#   CUSTOM_VAPIS
+#       some_vapi.vapi
+#   GENERATE_VAPI
+#       myvapi
+#   GENERATE_HEADER
+#       myheader
+#   )
+#
+# Most important is the variable VALA_C which will contain all the generated c
+# file names after the call.
+##
+
+macro(vala_precompile output)
+    parse_arguments(ARGS "PACKAGES;OPTIONS;DIRECTORY;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN})
+    if(ARGS_DIRECTORY)
+        set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY})
+    else(ARGS_DIRECTORY)
+        set(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR})
+    endif(ARGS_DIRECTORY)
+    include_directories(${DIRECTORY})
+    set(vala_pkg_opts "")
+    foreach(pkg ${ARGS_PACKAGES})
+        list(APPEND vala_pkg_opts "--pkg=${pkg}")
+    endforeach(pkg ${ARGS_PACKAGES})
+    set(in_files "")
+    set(out_files "")
+    set(${output} "")
+    foreach(src ${ARGS_DEFAULT_ARGS})
+        string(REGEX MATCH "^/" IS_MATCHED ${src})
+        if(${IS_MATCHED} MATCHES "/")
+            list(APPEND in_files "${src}")
+        else()
+            list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+        endif()
+        string(REPLACE ".vala" ".c" src ${src})
+        string(REPLACE ".gs" ".c" src ${src})
+        if(${IS_MATCHED} MATCHES "/")
+            string(REPLACE ${CMAKE_SOURCE_DIR} ${CMAKE_BINARY_DIR} src ${src})
+            #get_filename_component(VALA_FILE_NAME ${src} NAME)
+            set(out_file "${src}")
+            list(APPEND out_files "${src}")
+        else()
+            set(out_file "${DIRECTORY}/${src}")
+            list(APPEND out_files "${DIRECTORY}/${src}")
+        endif()
+        list(APPEND ${output} ${out_file})
+    endforeach(src ${ARGS_DEFAULT_ARGS})
+
+    set(custom_vapi_arguments "")
+    if(ARGS_CUSTOM_VAPIS)
+        foreach(vapi ${ARGS_CUSTOM_VAPIS})
+            if(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+                list(APPEND custom_vapi_arguments ${vapi})
+            else (${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+                list(APPEND custom_vapi_arguments ${CMAKE_CURRENT_SOURCE_DIR}/${vapi})
+            endif(${vapi} MATCHES ${CMAKE_SOURCE_DIR} OR ${vapi} MATCHES ${CMAKE_BINARY_DIR})
+        endforeach(vapi ${ARGS_CUSTOM_VAPIS})
+    endif(ARGS_CUSTOM_VAPIS)
+
+    set(vapi_arguments "")
+    if(ARGS_GENERATE_VAPI)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_VAPI}.vapi")
+        set(vapi_arguments "--internal-vapi=${ARGS_GENERATE_VAPI}.vapi")
+
+        # Header and internal header is needed to generate internal vapi
+        if (NOT ARGS_GENERATE_HEADER)
+            set(ARGS_GENERATE_HEADER ${ARGS_GENERATE_VAPI})
+        endif(NOT ARGS_GENERATE_HEADER)
+    endif(ARGS_GENERATE_VAPI)
+
+    set(header_arguments "")
+    if(ARGS_GENERATE_HEADER)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}.h")
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h")
+        list(APPEND header_arguments "--header=${DIRECTORY}/${ARGS_GENERATE_HEADER}.h")
+        list(APPEND header_arguments "--internal-header=${DIRECTORY}/${ARGS_GENERATE_HEADER}_internal.h")
+    endif(ARGS_GENERATE_HEADER)
+
+    add_custom_command(OUTPUT ${out_files} 
+    COMMAND 
+        ${VALA_EXECUTABLE} 
+    ARGS 
+        "-C" 
+        ${header_arguments} 
+        ${vapi_arguments}
+        "-b" ${CMAKE_CURRENT_SOURCE_DIR} 
+        "-d" ${DIRECTORY} 
+        ${vala_pkg_opts} 
+        ${ARGS_OPTIONS} 
+        ${in_files} 
+        ${custom_vapi_arguments}
+    DEPENDS 
+        ${in_files} 
+        ${ARGS_CUSTOM_VAPIS}
+    )
+endmacro(vala_precompile)

=== added file 'cmake/ValaVersion.cmake'
--- cmake/ValaVersion.cmake	1970-01-01 00:00:00 +0000
+++ cmake/ValaVersion.cmake	2012-02-17 22:20:22 +0000
@@ -0,0 +1,96 @@
+##
+# Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# 
+# Redistribution and use in source and binary forms, with or without
+# modification, are permitted provided that the following conditions are met:
+# 
+#    1. Redistributions of source code must retain the above copyright notice,
+#       this list of conditions and the following disclaimer.
+# 
+#    2. Redistributions in binary form must reproduce the above copyright notice,
+#       this list of conditions and the following disclaimer in the documentation
+#       and/or other materials provided with the distribution.
+# 
+# THIS SOFTWARE IS PROVIDED BY JAKOB WESTHOFF ``AS IS'' AND ANY EXPRESS OR
+# IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
+# MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO
+# EVENT SHALL JAKOB WESTHOFF OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT,
+# INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+# PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF
+# LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE
+# OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
+# ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+# 
+# The views and conclusions contained in the software and documentation are those
+# of the authors and should not be interpreted as representing official policies,
+# either expressed or implied, of Jakob Westhoff
+##
+
+include(ParseArguments)
+find_package(Vala REQUIRED)
+
+##
+# Ensure a certain valac version is available
+#
+# The initial argument is the version to check for
+# 
+# It may be followed by a optional parameter to specifiy a version range. The
+# following options are valid:
+# 
+# EXACT
+#   Vala needs to be available in the exact version given
+# 
+# MINIMUM
+#   The provided version is the minimum version. Therefore Vala needs to be
+#   available in the given version or any higher version
+#
+# MAXIMUM
+#   The provided version is the maximum. Therefore Vala needs to be available
+#   in the given version or any version older than this
+#
+# If no option is specified the version will be treated as a minimal version.
+##
+macro(ensure_vala_version version)
+    parse_arguments(ARGS "" "MINIMUM;MAXIMUM;EXACT" ${ARGN})
+	set(compare_message "")
+	set(error_message "")
+	if(ARGS_MINIMUM)
+		set(compare_message "a minimum ")
+		set(error_message "or greater ")
+	elseif(ARGS_MAXIMUM)
+		set(compare_message "a maximum ")
+		set(error_message "or less ")
+	endif(ARGS_MINIMUM)
+	
+	message(STATUS 
+		"checking for ${compare_message}Vala version of ${version}"
+	)
+
+	unset(version_accepted)
+	
+	# MINIMUM is the default if no option is specified
+	if(ARGS_EXACT)
+		if(${VALA_VERSION} VERSION_EQUAL ${version} )
+			set(version_accepted TRUE)	
+		endif(${VALA_VERSION} VERSION_EQUAL ${version})
+	elseif(ARGS_MAXIMUM)
+		if(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+			set(version_accepted TRUE)	
+		endif(${VALA_VERSION} VERSION_LESS ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+	else(ARGS_MAXIMUM)
+		if(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+			set(version_accepted TRUE)	
+		endif(${VALA_VERSION} VERSION_GREATER ${version} OR ${VALA_VERSION} VERSION_EQUAL ${version})
+	endif(ARGS_EXACT)
+
+	if (NOT version_accepted)
+		message(FATAL_ERROR 
+			"Vala version ${version} ${error_message}is required."
+		)
+	endif(NOT version_accepted)
+
+	message(STATUS
+		"  found Vala, version ${VALA_VERSION}"
+	)
+endmacro(ensure_vala_version)

=== added directory 'data'
=== renamed directory 'data' => 'data.moved'
=== added file 'data/audience.desktop'
--- data/audience.desktop	1970-01-01 00:00:00 +0000
+++ data/audience.desktop	2012-02-17 22:20:22 +0000
@@ -0,0 +1,9 @@
+[Desktop Entry]
+Type=Application
+Name=Audience
+Comment=Watch films the best way
+GenericName=Multimedia Viewer
+Exec=audience %U
+Icon=audience
+Terminal=false
+Categories=Gtk;Multimedia

=== added file 'data/audience.svg'
--- data/audience.svg	1970-01-01 00:00:00 +0000
+++ data/audience.svg	2012-02-17 22:20:22 +0000
@@ -0,0 +1,307 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://creativecommons.org/ns#"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:xlink="http://www.w3.org/1999/xlink"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   width="128"
+   height="128"
+   id="svg3886"
+   version="1.1"
+   inkscape:version="0.48.2 r9819"
+   sodipodi:docname="gpk-prefs.svg">
+  <defs
+     id="defs3888">
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3924"
+       id="linearGradient2984"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.7297298,0,0,2.7297298,-1.5135108,-62.513486)"
+       x1="23.99999"
+       y1="4.999989"
+       x2="23.99999"
+       y2="43" />
+    <linearGradient
+       id="linearGradient3924">
+      <stop
+         id="stop3926"
+         style="stop-color:#ffffff;stop-opacity:1;"
+         offset="0" />
+      <stop
+         offset="0.06316455"
+         style="stop-color:#ffffff;stop-opacity:0.23529412;"
+         id="stop3928" />
+      <stop
+         id="stop3930"
+         style="stop-color:#ffffff;stop-opacity:0.15686275;"
+         offset="0.95056331" />
+      <stop
+         id="stop3932"
+         style="stop-color:#ffffff;stop-opacity:0.39215687;"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient7012-661-145-733-759-865-745-661-970-94-8"
+       id="radialGradient2990"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(5.131108e-8,6.1720507,-6.5292935,-1.1371273e-7,119.1713,-93.225241)"
+       cx="7.4956832"
+       cy="8.4497671"
+       fx="7.4956832"
+       fy="8.4497671"
+       r="19.99999" />
+    <linearGradient
+       id="linearGradient7012-661-145-733-759-865-745-661-970-94-8">
+      <stop
+         id="stop3618-1"
+         style="stop-color:#ed665f;stop-opacity:1;"
+         offset="0" />
+      <stop
+         id="stop3270-2"
+         style="stop-color:#eb564e;stop-opacity:1;"
+         offset="0.5" />
+      <stop
+         id="stop3620-8"
+         style="stop-color:#de291f;stop-opacity:0.94117647;"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient3390-178-986-453-3"
+       id="linearGradient2992"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.6410257,0,0,2.6410257,0.6153792,-60.384617)"
+       x1="24"
+       y1="44"
+       x2="24"
+       y2="3.8990016" />
+    <linearGradient
+       id="linearGradient3390-178-986-453-3">
+      <stop
+         id="stop3624-6"
+         style="stop-color:#ba4712;stop-opacity:1;"
+         offset="0" />
+      <stop
+         offset="0.5"
+         style="stop-color:#cf671c;stop-opacity:1;"
+         id="stop3856-8" />
+      <stop
+         id="stop3626-0"
+         style="stop-color:#e27f39;stop-opacity:1;"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient2455"
+       xlink:href="#linearGradient3688-166-749"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,27.98813,-17.4)" />
+    <linearGradient
+       id="linearGradient3688-166-749">
+      <stop
+         id="stop2883"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2885"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <radialGradient
+       cx="4.9929786"
+       cy="43.5"
+       r="2.5"
+       fx="4.9929786"
+       fy="43.5"
+       id="radialGradient2457"
+       xlink:href="#linearGradient3688-464-309"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(2.003784,0,0,1.4,-20.01187,-104.4)" />
+    <linearGradient
+       id="linearGradient3688-464-309">
+      <stop
+         id="stop2889"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0" />
+      <stop
+         id="stop2891"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       x1="25.058096"
+       y1="47.027729"
+       x2="25.058096"
+       y2="39.999443"
+       id="linearGradient2459"
+       xlink:href="#linearGradient3702-501-757"
+       gradientUnits="userSpaceOnUse" />
+    <linearGradient
+       id="linearGradient3702-501-757">
+      <stop
+         id="stop2895"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="0" />
+      <stop
+         id="stop2897"
+         style="stop-color:#181818;stop-opacity:1"
+         offset="0.5" />
+      <stop
+         id="stop2899"
+         style="stop-color:#181818;stop-opacity:0"
+         offset="1" />
+    </linearGradient>
+    <linearGradient
+       inkscape:collect="always"
+       xlink:href="#linearGradient8265-821-176-38-919-66-249-7-7"
+       id="linearGradient3568"
+       gradientUnits="userSpaceOnUse"
+       gradientTransform="matrix(0.82498024,0,0,1.3012336,4.1618797,-1.4329212)"
+       x1="16.626165"
+       y1="15.298182"
+       x2="20.054544"
+       y2="24.627615" />
+    <linearGradient
+       id="linearGradient8265-821-176-38-919-66-249-7-7">
+      <stop
+         offset="0"
+         style="stop-color:#ffffff;stop-opacity:1"
+         id="stop2687-1-9" />
+      <stop
+         offset="1"
+         style="stop-color:#ffffff;stop-opacity:0"
+         id="stop2689-5-4" />
+    </linearGradient>
+    <linearGradient
+       y2="24.627615"
+       x2="20.054544"
+       y1="15.298182"
+       x1="16.626165"
+       gradientTransform="matrix(2.1375158,0,0,3.3714836,11.830225,-65.192915)"
+       gradientUnits="userSpaceOnUse"
+       id="linearGradient7220"
+       xlink:href="#linearGradient8265-821-176-38-919-66-249-7-7"
+       inkscape:collect="always" />
+  </defs>
+  <sodipodi:namedview
+     id="base"
+     pagecolor="#ffffff"
+     bordercolor="#666666"
+     borderopacity="1.0"
+     inkscape:pageopacity="0.0"
+     inkscape:pageshadow="2"
+     inkscape:zoom="1"
+     inkscape:cx="181.88759"
+     inkscape:cy="97.72879"
+     inkscape:current-layer="layer1"
+     showgrid="true"
+     inkscape:document-units="px"
+     inkscape:grid-bbox="true"
+     inkscape:window-width="1920"
+     inkscape:window-height="1105"
+     inkscape:window-x="0"
+     inkscape:window-y="24"
+     inkscape:window-maximized="1" />
+  <metadata
+     id="metadata3891">
+    <rdf:RDF>
+      <cc:Work
+         rdf:about="">
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type
+           rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+        <dc:title></dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <g
+     id="layer1"
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     transform="translate(0,64)">
+    <g
+       transform="matrix(2.9499988,0,0,1.2222234,-6.8000012,1.555537)"
+       id="g2036"
+       style="display:inline">
+      <g
+         transform="matrix(1.052632,0,0,1.285713,-1.263158,-13.42854)"
+         id="g3712"
+         style="opacity:0.4">
+        <rect
+           width="5"
+           height="7"
+           x="38"
+           y="40"
+           id="rect2801"
+           style="fill:url(#radialGradient2455);fill-opacity:1;stroke:none" />
+        <rect
+           width="5"
+           height="7"
+           x="-10"
+           y="-47"
+           transform="scale(-1,-1)"
+           id="rect3696"
+           style="fill:url(#radialGradient2457);fill-opacity:1;stroke:none" />
+        <rect
+           width="28"
+           height="7.0000005"
+           x="10"
+           y="40"
+           id="rect3700"
+           style="fill:url(#linearGradient2459);fill-opacity:1;stroke:none" />
+      </g>
+    </g>
+    <rect
+       style="color:#000000;fill:url(#radialGradient2990);fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient2992);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate"
+       id="rect5505-21"
+       y="-48.5"
+       x="12.5"
+       ry="6"
+       rx="6"
+       height="103"
+       width="103" />
+    <rect
+       style="opacity:0.5;fill:none;stroke:url(#linearGradient2984);stroke-width:0.99999994;stroke-linecap:round;stroke-linejoin:round;stroke-miterlimit:4;stroke-opacity:1;stroke-dasharray:none;stroke-dashoffset:0"
+       id="rect6741-7"
+       y="-47.5"
+       x="13.5"
+       ry="5"
+       rx="5"
+       height="101"
+       width="101" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.2;fill:url(#linearGradient7220);fill-opacity:1;fill-rule:evenodd;stroke:none"
+       id="path3333"
+       d="m 15.166068,-45.669124 c 0,0 -1.56203,1.74547 -1.164282,4.398617 l 0.03278,57.519984 c 2.832385,-0.06262 97.777614,-23.0548347 99.927464,-24.1544069 l 0,-33.2329941 c 0.44332,-3.031978 -1.27524,-5.659066 -4.11606,-5.840559 l -92.160807,-0.01647 c -0.814226,0.340053 -1.59412,0.542777 -2.519095,1.325825 z"
+       sodipodi:nodetypes="cccccccc" />
+    <path
+       inkscape:connector-curvature="0"
+       style="opacity:0.15;fill:#ba4812;fill-opacity:1;stroke:none;display:inline"
+       d="m 64.220775,-44.023085 c -0.808191,5.400067 -1.423983,10.144207 -1.891401,14.362692 -7.311743,0.43668 -13.852657,3.374713 -18.570169,7.859345 -2.766937,-2.545898 -6.131536,-6.167913 -10.331069,-11.59531 3.353134,7.986617 5.505374,12.1986 7.422327,14.846992 -2.959457,3.958636 -4.693599,8.700569 -4.699851,13.809211 L 24.501279,-9.707598 40.735832,8.9860437 C 45.47524,15.427546 53.464549,19.799382 62.615946,20.263107 l 0.02866,2.407626 c -8.475839,-1.215962 -17.511664,-6.022096 -25.591285,-9.229216 7.941212,4.673732 16.007253,19.633617 25.634262,12.716104 l 0.100294,6.876921 c -1.702309,-1.459101 -3.336721,-3.021613 -6.505282,-2.767343 5.483546,7.200982 4.078272,10.866023 7.938166,14.390345 3.859898,-3.524322 2.454615,-7.189363 7.938165,-14.390345 -3.168559,-0.25427 -4.802972,1.308242 -6.505289,2.767343 l 0.100303,-6.876921 c 9.627027,6.917513 17.693032,-8.042372 25.634191,-12.716104 -8.079541,3.20712 -17.115394,8.013254 -25.591189,9.229216 l 0.02865,-2.407626 C 74.982385,19.803204 82.967813,15.430876 87.705609,8.9860437 L 103.94028,-9.707598 92.276642,-4.726317 c -0.0051,-5.113911 -1.725884,-9.860827 -4.685492,-13.823049 1.916879,-2.648392 4.069147,-6.860375 7.422255,-14.846992 -4.199563,5.427346 -7.549812,9.049412 -10.31676,11.59531 -4.717267,-4.488787 -11.266345,-7.425553 -18.584471,-7.859345 -0.467423,-4.218485 -1.083208,-8.962625 -1.891403,-14.362692 z m 2.263964,17.863431 c 5.682604,0.505347 10.717778,3.386169 14.171154,7.679471 -6.643056,4.803287 -9.055255,3.329907 -14.013546,15.774055 0.782713,-4.126149 1.038112,-11.179288 -0.157608,-23.453526 z m -4.527919,0.110693 c -1.183581,12.206725 -0.938005,19.228945 -0.157618,23.342833 -4.804532,-12.058254 -7.208977,-11.049517 -13.397444,-15.345118 3.270208,-4.283689 8.075894,-7.250616 13.555062,-7.997715 z m 21.306955,11.719842 c 1.401241,2.897034 2.192299,6.157218 2.192299,9.61664 0,11.4696989 -8.666149,20.844962 -19.573153,21.488687 l 0.05735,-3.846652 14.586731,-14.556412 c -2.934995,1.225078 -7.54641,1.833771 -7.809187,4.0265388 l -6.662907,2.2277418 0.04297,-2.9887716 c 9.394109,-11.087628 13.868365,-13.600329 17.165903,-15.967772 z m -37.383894,0.498131 c 3.238289,2.258008 7.728992,5.160226 16.463819,15.469641 l 0.043,2.9887716 -6.66291,-2.2277418 C 55.461006,0.206915 50.849592,-0.401778 47.914575,-1.626856 l 14.586736,14.556412 0.05731,3.777469 C 52.091881,15.604012 43.916815,6.431052 43.916815,-4.712479 c 0,-3.262892 0.709135,-6.346687 1.963047,-9.118509 z"
+       id="path3708-4"
+       inkscape:export-filename="/home/codygarver/path18.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+    <path
+       inkscape:connector-curvature="0"
+       style="fill:#ffcc00;fill-opacity:1;stroke:none;display:inline"
+       d="m 64.069027,-42.549471 c -0.772526,5.345285 -1.361142,10.041296 -1.807936,14.216988 -6.98909,0.432251 -13.24137,3.340479 -17.750704,7.779614 -2.644841,-2.52007 -5.860966,-6.10534 -9.875182,-11.477679 3.205169,7.905596 5.262433,12.07485 7.094796,14.696376 -2.828863,3.918477 -4.486481,8.6123061 -4.492456,13.6691221 L 26.102273,-8.5821009 41.620429,9.9219031 C 46.150695,16.298057 53.787453,20.625542 62.535018,21.084564 l 0.02742,2.383201 c -8.101839,-1.203628 -16.73893,-5.961004 -24.462016,-9.135587 7.590782,4.626316 15.300887,19.434441 24.503075,12.587102 l 0.09587,6.807159 c -1.627191,-1.4443 -3.18948,-2.99096 -6.218219,-2.73927 5.241568,7.12793 3.898305,10.75579 7.587871,14.24436 3.689567,-3.48857 2.346298,-7.11643 7.58787,-14.24436 -3.028736,-0.25169 -4.591027,1.29497 -6.218225,2.73927 l 0.09588,-6.807159 c 9.202205,6.847339 16.912271,-7.960786 24.503007,-12.587102 -7.723011,3.174583 -16.360131,7.931959 -24.461905,9.135587 l 0.02739,-2.383201 C 74.355755,20.629327 81.9888,16.301354 86.517528,9.9219031 l 15.518262,-18.504004 -11.148945,4.930749 c -0.0043,-5.062032 -1.649718,-9.7607931 -4.478725,-13.6828201 1.832288,-2.621526 3.889588,-6.79078 7.094722,-14.696376 -4.014246,5.372289 -7.216649,8.957609 -9.861498,11.477679 -4.509104,-4.443249 -10.769185,-7.350222 -17.764375,-7.779614 -0.446798,-4.175692 -1.035412,-8.871703 -1.807942,-14.216988 z m 2.16406,17.682211 c 5.431844,0.500224 10.244826,3.35182 13.545812,7.601569 -6.349914,4.754558 -8.655665,3.296127 -13.39516,15.6140331 0.748175,-4.08429 0.992304,-11.0658791 -0.150652,-23.2156021 z m -4.328109,0.109572 c -1.131355,12.082894 -0.896614,19.0338761 -0.150664,23.1060301 -4.592516,-11.9359271 -6.89086,-10.9374231 -12.80624,-15.1894481 3.125899,-4.240231 7.71952,-7.177062 12.956904,-7.916582 z m 20.366721,11.600951 c 1.339407,2.867644 2.095559,6.0947551 2.095559,9.5190821 0,11.353344 -8.283732,20.6334989 -18.709432,21.2706929 l 0.05481,-3.807629 13.943049,-14.40874295 c -2.805481,1.21265 -7.213402,1.81516805 -7.464583,3.98568905 l -6.368888,2.205143 0.04107,-2.958451 C 74.842859,-8.3260999 79.119676,-10.813312 82.271699,-13.156737 z m -35.734218,0.493076 c 3.09539,2.235102 7.387927,5.1078791 15.737302,15.3127081 l 0.04109,2.958451 -6.368886,-2.205143 c -0.251181,-2.170521 -4.6591,-2.77303905 -7.464601,-3.98568905 l 13.943052,14.40874295 0.05478,3.739147 C 52.475358,16.472734 44.661041,7.3928301 44.661041,-3.6376549 c 0,-3.229791 0.677844,-6.282302 1.876421,-9.0260061 z"
+       id="path3708"
+       inkscape:export-filename="/home/codygarver/path18.png"
+       inkscape:export-xdpi="90"
+       inkscape:export-ydpi="90" />
+  </g>
+</svg>

=== added directory 'po'
=== renamed directory 'po' => 'po.moved'
=== added file 'po/CMakeLists.txt'
--- po/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ po/CMakeLists.txt	2012-02-17 22:20:22 +0000
@@ -0,0 +1,5 @@
+include (Translations)
+add_translations_directory (audience)
+add_translations_catalog (audience
+    ../src
+)

=== added directory 'src'
=== added file 'src/Config.vala.cmake'
--- src/Config.vala.cmake	1970-01-01 00:00:00 +0000
+++ src/Config.vala.cmake	2012-02-17 22:20:22 +0000
@@ -0,0 +1,11 @@
+
+namespace Constants {
+    public const string DATADIR = "@DATADIR@";
+    public const string PKGDATADIR = "@PKGDATADIR@";
+    public const string GETTEXT_PACKAGE = "@GETTEXT_PACKAGE@";
+    public const string RELEASE_NAME = "@RELEASE_NAME@";
+    public const string VERSION = "@VERSION@";
+    public const string VERSION_INFO = "@VERSION_INFO@";
+    public const string PLUGINDIR = "@PLUGINDIR@";
+}
+

=== added directory 'src/Widgets'
=== added file 'src/Widgets/previewer.vala'
--- src/Widgets/previewer.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/previewer.vala	2012-02-17 22:20:22 +0000
@@ -0,0 +1,19 @@
+
+
+namespace Audience.Widgets{
+    
+    public class Previewer : ClutterGst.VideoTexture{
+        
+        public Previewer (){
+            
+            this.width        = 120;
+            this.height       = 120;
+            this.y            = 2;
+            this.opacity      = 0;
+            this.audio_volume = 0.0;
+            
+        }
+        
+    }
+    
+}

=== added file 'src/Widgets/tag_view.vala'
--- src/Widgets/tag_view.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/tag_view.vala	2012-02-17 22:20:22 +0000
@@ -0,0 +1,184 @@
+
+/*
+  The panel on the right hand side
+*/
+
+namespace Audience.Widgets{
+    
+    public class TagView : GtkClutter.Actor{
+        
+        public bool expanded;
+        public Gtk.Grid taggrid;
+        public Gtk.ListStore playlist;
+        public AudienceApp app;
+        
+        public TagView (AudienceApp app){
+            this.app = app;
+            
+            var notebook = new Granite.Widgets.StaticNotebook ();
+            
+            /*tags*/
+            taggrid = new Gtk.Grid ();
+            taggrid.column_spacing = 10;
+            taggrid.margin = 12;
+            
+            /*chapters*/
+            var chaptergrid = new Gtk.Grid ();
+            chaptergrid.margin = 12;
+            chaptergrid.attach (new LLabel.markup ("<span weight='bold' font='20'>Go to...</span>"), 0, 0, 1, 1);
+            
+            chaptergrid.attach (
+                new Gtk.Image.from_icon_name ("edit-find-symbolic", Gtk.IconSize.MENU), 0, 1, 1, 1);
+            chaptergrid.attach (new Gtk.Button.with_label ("Menu"), 1, 1, 1, 1);
+            chaptergrid.attach (
+                new Gtk.Image.from_icon_name ("folder-music-symbolic", Gtk.IconSize.MENU), 0, 2, 1, 1);
+            chaptergrid.attach (new Gtk.Button.with_label ("Audio Menu"), 1, 2, 1, 1);
+            chaptergrid.attach (
+                new Gtk.Image.from_icon_name ("folder-videos-symbolic", Gtk.IconSize.MENU), 0, 3, 1, 1);
+            chaptergrid.attach (new Gtk.Button.with_label ("Chapter Menu"), 1, 3, 1, 1);
+            for (var i=1;i<10;i++){
+                chaptergrid.attach (
+                    new Gtk.Image.from_icon_name ("view-list-video-symbolic", Gtk.IconSize.MENU), 0, i+3, 1, 1);
+                var bt = new Gtk.Button.with_label ("Chapter 0"+i.to_string ());
+                bt.hexpand = true;
+                chaptergrid.attach (bt, 1, i+3, 1, 1);
+            }
+            
+            /*setup*/
+            var setupgrid = new Gtk.Grid ();
+            var languages = new Gtk.ComboBoxText ();
+            var subtitles = new Gtk.ComboBoxText ();
+            setupgrid.attach (new LLabel.markup (
+                "<span weight='bold' font='20'>Setup</span>"), 0, 0, 1, 1);
+            setupgrid.attach (new Gtk.Label ("Language"),  0, 1, 1, 1);
+            setupgrid.attach (languages,                   1, 1, 1, 1);
+            setupgrid.attach (new Gtk.Label ("Subtitles"), 0, 2, 1, 1);
+            setupgrid.attach (subtitles,                   1, 2, 1, 1);
+            setupgrid.column_homogeneous = true;
+            setupgrid.margin = 12;
+            
+            languages.append ("eng", "English (UK)");
+            languages.append ("de", "German");
+            languages.append ("fr", "French");
+            languages.active = 0;
+            subtitles.append ("0", "None");
+            subtitles.append ("eng", "English (UK");
+            subtitles.append ("de", "German");
+            subtitles.append ("fr", "French");
+            subtitles.active = 0;
+            
+            /*playlist*/
+            var playlistgrid    = new Gtk.Grid ();
+            playlistgrid.margin = 12;
+            playlist            = new Gtk.ListStore (4, typeof (Gdk.Pixbuf),  /*playing*/
+                                                        typeof (Gdk.Pixbuf),  /*icon*/
+                                                        typeof (string),      /*title*/
+                                                        typeof (string));     /*filename*/
+            var playlisttree    = new Gtk.TreeView.with_model (playlist);
+            playlisttree.expand = true;
+            playlisttree.headers_visible = false;
+            var css = new Gtk.CssProvider ();
+            try{
+                css.load_from_data ("*{background-color:@bg_color;}", -1);
+            }catch (Error e){warning (e.message);}
+            playlisttree.get_style_context ().add_provider (css, 12000);
+            
+            playlisttree.insert_column_with_attributes (-1, "", new Gtk.CellRendererPixbuf (),
+                "pixbuf", 0);
+            playlisttree.insert_column_with_attributes (-1, "", new Gtk.CellRendererPixbuf (),
+                "pixbuf", 1);
+            playlisttree.insert_column_with_attributes (-1, "", new Gtk.CellRendererText (),
+                "text", 2);
+            
+            playlisttree.row_activated.connect ( (path ,col) => {
+                Gtk.TreeIter iter;
+                playlist.get_iter (out iter, path);
+                string filename;
+                playlist.get (iter, 3, out filename);
+                app.open_file (filename);
+            });
+            
+            playlistgrid.attach (new LLabel.markup (
+                "<span weight='bold' font='20'>Playlist</span>"), 0, 0, 1, 1);
+            playlistgrid.attach (playlisttree, 0, 1, 1, 1);
+            
+            
+            notebook.append_page (taggrid, new Gtk.Label ("Details"));
+            notebook.append_page (chaptergrid, new Gtk.Label ("Chapters"));
+            notebook.append_page (setupgrid, new Gtk.Label ("Setup"));
+            notebook.append_page (playlistgrid, new Gtk.Label ("Playlist"));
+            
+            ((Gtk.Bin)this.get_widget ()).add (notebook);
+            
+            notebook.show_all ();
+            
+            this.height = this.get_stage ().height;
+            this.width  = 200;
+            this.expanded = false;
+        }
+        
+        public void add_play_item (string filename){
+            try{
+                Gtk.TreeIter iter;
+                var ext = Audience.get_extension (filename);
+                Gdk.Pixbuf pix = null;
+                if (ext in Audience.audio)
+                    pix = Gtk.IconTheme.get_default ().load_icon ("folder-music-symbolic", 16, 0);
+                else
+                    pix = Gtk.IconTheme.get_default ().load_icon ("folder-videos-symbolic", 16, 0);
+                var playing = Gtk.IconTheme.get_default ().load_icon ("media-playback-start-symbolic", 16, 0);
+                playlist.append (out iter);
+                playlist.set (iter, 0, playing, 1, pix, 
+                                    2, Audience.get_basename (filename), 3, filename);
+            }catch (Error e){warning (e.message);}
+            
+        }
+        
+        public void expand (){
+            var x2 = this.get_stage ().width - this.width;
+            this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, x:x2);
+            this.expanded = true;
+        }
+        
+        public void collapse (){
+            var x2 = this.get_stage ().width;
+            this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, x:x2);
+            this.expanded = false;
+        }
+        
+        public void get_tags (string filename, bool set_title){
+            var pipe = new Gst.Pipeline ("tagpipe");
+            var src  = Gst.ElementFactory.make ("uridecodebin", "src");
+            var sink = Gst.ElementFactory.make ("fakesink", "sink");
+            src.set ("uri", File.new_for_commandline_arg (filename).get_uri ());
+            pipe.add_many (src, sink);
+            
+            pipe.set_state (Gst.State.PAUSED);
+            
+            taggrid.foreach ( (w) => {taggrid.remove (w);});
+            taggrid.attach (new LLabel.markup ("<span weight='bold' font='20'>Info</span>"), 0, 0, 1, 1);
+            var index = 1;
+            pipe.get_bus ().add_watch ( (bus, msg) => {
+                if (msg.type == Gst.MessageType.TAG){
+                    Gst.TagList tag_list;
+                    msg.parse_tag (out tag_list);
+                    tag_list.foreach ( (list, tag) => {
+                        for (var i=0;i<list.get_tag_size (tag);i++){
+                            var val = list.get_value_index (tag, i);
+                            if (set_title && tag == "title")
+                                this.app.mainwindow.title = val.strdup_contents ();
+                            taggrid.attach (new LLabel.markup ("<b>"+tag+"</b>"), 0, index, 1, 1);
+                            taggrid.attach (new LLabel (val.strdup_contents ()),  1, index, 1, 1);
+                            taggrid.show_all ();
+                            index ++;
+                        }
+                    });
+                }else if (msg.type == Gst.MessageType.EOS)
+                    pipe.set_state (Gst.State.NULL);
+                return true;
+            });
+            pipe.set_state (Gst.State.PLAYING);
+        }
+    }
+    
+}

=== added file 'src/audience.vala'
--- src/audience.vala	1970-01-01 00:00:00 +0000
+++ src/audience.vala	2012-02-17 22:20:22 +0000
@@ -0,0 +1,556 @@
+
+
+namespace Audience{
+    
+    public const string [] video = {
+    "mpg",
+    "flv",
+    "mp4"
+    };
+    public const string [] audio = {
+    "mp3",
+    "ogg"
+    };
+    
+    public static string get_extension (string filename){
+        int i=0;
+        for (i=filename.length;i!=0;i--){
+            if (filename [i] == '.')
+                break;
+        }
+        return filename.substring (i+1);
+    }
+    public static string get_basename (string filename){
+        int i=0;
+        for (i=filename.length;i!=0;i--){
+            if (filename [i] == '.')
+                break;
+        }
+        int j=0;
+        for (j=filename.length;j!=0;j--){
+            if (filename[j] == '/')
+                break;
+        }
+        return filename.substring (j + 1, i - j - 1);
+    }
+    
+    public static string seconds_to_time (int secs){
+        int hours = 0;
+        int min = 0;
+        while (secs >= 60){
+            ++min;
+            secs -= 60;
+        }
+        int min_tmp = min;
+        while (min >= 60){
+            ++hours;
+            min_tmp -= 60;
+        }
+        string seconds = (secs < 10)?"0"+secs.to_string ():secs.to_string ();
+        
+        string ret = (hours > 0)?hours.to_string ():"";
+        ret += min.to_string () + ":" + seconds;
+        return ret;
+    }
+    
+    class LLabel : Gtk.Label{
+        public LLabel (string label){
+            this.set_halign (Gtk.Align.START);
+            this.label = label;
+        }
+        public LLabel.indent (string label){
+            this (label);
+            this.margin_left = 10;
+        }
+        public LLabel.markup (string label){
+            this (label);
+            this.use_markup = true;
+        }
+        public LLabel.right (string label){
+            this.set_halign (Gtk.Align.END);
+            this.label = label;
+        }
+        public LLabel.right_with_markup (string label){
+            this.set_halign (Gtk.Align.END);
+            this.use_markup = true;
+            this.label = label;
+        }
+    }
+    
+    public class AudienceApp : Granite.Application{
+        
+        construct{
+            program_name = "Audience";
+            exec_name = "audience";
+            
+            build_data_dir = Constants.DATADIR;
+            build_pkg_data_dir = Constants.PKGDATADIR;
+            build_release_name = Constants.RELEASE_NAME;
+            build_version = Constants.VERSION;
+            build_version_info = Constants.VERSION_INFO;
+            
+            app_years = "";
+            app_icon = "audience";
+            app_launcher = "audience.desktop";
+            application_id = "net.launchpad.audience";
+            
+            main_url = "https://code.launchpad.net/audience";
+            bug_url = "https://bugs.launchpad.net/audience";
+            help_url = "https://code.launchpad.net/audience";
+            translate_url = "https://translations.launchpad.net/audience";
+            
+            about_authors = {""};
+            about_documenters = {""};
+            about_artists = {""};
+            about_comments = "Watch films the best way";
+            about_translators = "";
+            about_license_type = Gtk.License.GPL_3_0;
+        }
+        
+        public ClutterGst.VideoTexture    canvas;
+        public Gtk.Window                 mainwindow;
+        public Audience.Widgets.TagView   tagview;
+        public Gtk.Scale                  slider;
+        public Audience.Widgets.Previewer previewer;
+        public GtkClutter.Actor           bar;
+        public Gtk.Toolbar                toolbar;
+        public Gtk.ToolButton             play;
+        public Gtk.ToolButton             pause;
+        public Gtk.ToolButton             unfullscreen;
+        public Clutter.Stage              stage;
+        public bool                       fullscreened;
+        public uint                       hiding_timer;
+        
+        private float video_w;
+        private float video_h;
+        private bool  just_opened;
+        private bool  reached_end;
+        
+        private Gdk.Cursor normal_cursor;
+        private Gdk.Cursor blank_cursor;
+        
+        private inline Gtk.Image? sym (string name){
+            try{
+            return new Gtk.Image.from_pixbuf (Gtk.IconTheme.get_default ().lookup_icon 
+                (name, 24, 0).load_symbolic ({1.0,1.0,1.0,1.0}, null, null, null, null));
+            }catch (Error e){warning (e.message);return null;}
+        }
+        
+        public AudienceApp (){
+            Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
+            
+            this.flags |= GLib.ApplicationFlags.HANDLES_OPEN;
+            
+            this.fullscreened = false;
+            
+            this.canvas     = new ClutterGst.VideoTexture ();
+            this.mainwindow = new Gtk.Window ();
+            this.tagview    = new Audience.Widgets.TagView (this);
+            this.previewer  = new Audience.Widgets.Previewer ();
+            this.bar        = new GtkClutter.Actor ();
+            this.toolbar    = new Gtk.Toolbar ();
+            var mainbox     = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            var clutter     = new GtkClutter.Embed ();
+            this.stage      = (Clutter.Stage)clutter.get_stage ();
+            this.play       = new Gtk.ToolButton (sym ("media-playback-start-symbolic"), "");
+            this.pause      = new Gtk.ToolButton (sym ("media-playback-pause-symbolic"), "");
+            var time_item   = new Gtk.ToolItem ();
+            var slider_item = new Gtk.ToolItem ();
+            var remain_item = new Gtk.ToolItem ();
+            var volm        = new Gtk.ToolItem ();
+            var info        = new Gtk.ToggleToolButton ();
+            var open        = new Gtk.ToolButton (sym ("document-export-symbolic"),"");
+            var menu        = new Gtk.Menu ();
+            var appm        = this.create_appmenu (menu);
+            this.slider     = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 100, 1);
+            var volume      = new Gtk.VolumeButton ();
+            var time        = new Gtk.Label ("0");
+            var remaining   = new Gtk.Label ("0");
+            this.unfullscreen = new Gtk.ToolButton (
+                new Gtk.Image.from_stock (Gtk.Stock.LEAVE_FULLSCREEN, Gtk.IconSize.BUTTON), "");
+            this.blank_cursor  = new Gdk.Cursor (Gdk.CursorType.BLANK_CURSOR);
+            this.normal_cursor = this.mainwindow.get_window ().get_cursor ();
+            
+            /*UI*/
+            stage.add_actor (canvas);
+            stage.add_actor (tagview);
+            stage.add_actor (previewer);
+            stage.add_actor (bar);
+            stage.color = Clutter.Color.from_string ("#000");
+            
+            this.tagview.x      = stage.width;
+            this.tagview.width  = 350;
+            
+            this.mainwindow.set_application (this);
+            this.mainwindow.add (mainbox);
+            this.mainwindow.set_default_size (654, 352);
+            
+            slider_item.set_expand (true);
+            slider_item.add (slider);
+            slider.draw_value = false;
+            
+            volm.add (volume);
+            volume.use_symbolic = true;
+            
+            time_item.add (time);
+            remain_item.add (remaining);
+            
+            info.icon_widget = sym ("view-list-filter-symbolic");
+            appm.icon_widget = sym ("document-properties-symbolic");
+            
+            play.sensitive = false;
+            
+            play.margin = time_item.margin = slider_item.margin = pause.margin = 
+            volm.margin = info.margin = open.margin = appm.margin = 5;
+            
+            toolbar.insert (play, -1);
+            toolbar.insert (time_item,   -1);
+            toolbar.insert (slider_item, -1);
+            toolbar.insert (remain_item, -1);
+            toolbar.insert (volm, -1);
+            toolbar.insert (info, -1);
+            toolbar.insert (open, -1);
+            toolbar.insert (appm, -1);
+            
+            var css = new Gtk.CssProvider ();
+            try{
+            css.load_from_data ("
+                *{
+                    background-color:rgba(0,0,0,0);
+                    background-image:none;
+                    color:white;
+                }
+                ", -1);
+            }catch (Error e){warning (e.message);}
+            toolbar.get_style_context ().add_provider (css, 12000);
+            remaining.get_style_context ().add_provider (css, 12000);
+            time.get_style_context ().add_provider (css, 12000);
+            
+            bar.get_widget ().draw.connect ( (ctx) => {
+                ctx.set_operator (Cairo.Operator.SOURCE);
+                ctx.rectangle (0, 0, bar.get_widget ().get_allocated_width  (), 
+                                     bar.get_widget ().get_allocated_height ());
+                ctx.set_source_rgba (0.0, 0.0, 0.0, 0.8);
+                ctx.fill ();
+                return false;
+            });
+            
+            toolbar.show_all ();
+            ((Gtk.Container)bar.get_widget ()).add (toolbar);
+            
+            mainbox.pack_start (clutter);
+            
+            this.previewer.get_pipeline ().set_state (Gst.State.PLAYING);
+            
+            /*events*/
+            //end
+            this.canvas.eos.connect ( () => {
+                reached_end = true;
+                this.toggle_play (false);
+            });
+            
+            //slider
+            ulong id = slider.value_changed.connect ( () => {
+                canvas.progress = slider.get_value () / canvas.duration;
+            });
+            Timeout.add (1000, () => {
+                SignalHandler.block (slider, id);
+                slider.set_range (0, canvas.duration);
+                slider.set_value (canvas.duration * canvas.progress);
+                SignalHandler.unblock (slider, id);
+                
+                time.label = seconds_to_time ((int)slider.get_value ());
+                
+                remaining.label = "-" + seconds_to_time ((int)(canvas.duration - 
+                    slider.get_value ()));
+                return true;
+            });
+            
+            //volume
+            volume.value_changed.connect ( () => {
+                canvas.audio_volume = volume.value;
+            });
+            volume.value = 1.0;
+            
+            //preview thing
+            slider.motion_notify_event.connect ( (e) => {
+                previewer.x = (float)e.x;
+                previewer.y = stage.height - 180;
+                Timeout.add (200, () => {
+                    previewer.progress = e.x / slider.get_allocated_width ();
+                    return false;
+                });
+                return false;
+            });
+            slider.enter_notify_event.connect ( (e) => {
+                previewer.get_pipeline ().set_state (Gst.State.PLAYING);
+                var o2 = 255;
+                previewer.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, opacity:o2);
+                previewer.raise_top ();
+                return false;
+            });
+            slider.leave_notify_event.connect ( (e) => {
+                var o2 = 0;
+                previewer.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, opacity:o2);
+                previewer.get_pipeline ().set_state (Gst.State.PAUSED);
+                Timeout.add (400, () => {previewer.lower_bottom ();return false;});
+                return false;
+            });
+            
+            /*slide controls back in*/
+            this.mainwindow.motion_notify_event.connect ( () => {
+                float y2 = this.stage.height - 56;
+                this.bar.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 100, y:y2);
+                this.mainwindow.get_window ().set_cursor (normal_cursor);
+                Gst.State state;
+                canvas.get_pipeline ().get_state (out state, null, 0);
+                if (state == Gst.State.PLAYING){
+                    Source.remove (this.hiding_timer);
+                    this.hiding_timer = GLib.Timeout.add (2000, () => {
+                        this.mainwindow.get_window ().set_cursor (blank_cursor);
+                        float y3 = this.stage.height;
+                        this.bar.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 1000, y:y3);
+                        return false;
+                    });
+                }
+                return false;
+            });
+            
+            /*open location popover*/
+            open.clicked.connect ( () => {
+                var pop = new Granite.Widgets.PopOver ();
+                var box = new Gtk.Grid ();
+                ((Gtk.Box)pop.get_content_area ()).add (box);
+                
+                box.row_spacing    = 5;
+                box.column_spacing = 12;
+                
+                var fil   = new Gtk.Button.with_label ("File");
+                var fil_i = new Gtk.Image.from_stock (Gtk.Stock.OPEN, Gtk.IconSize.DND);
+                var cd    = new Gtk.Button.with_label ("CD");
+                var cd_i  = new Gtk.Image.from_icon_name ("media-cdrom-audio", Gtk.IconSize.DND);
+                var dvd   = new Gtk.Button.with_label ("DVD");
+                var dvd_i = new Gtk.Image.from_icon_name ("media-cdrom", Gtk.IconSize.DND);
+                var net   = new Gtk.Button.with_label ("Network File");
+                var net_i = new Gtk.Image.from_icon_name ("internet-web-browser", Gtk.IconSize.DND);
+                
+                fil.clicked.connect ( () => {
+                    pop.destroy ();
+                    var file = new Gtk.FileChooserDialog ("Open", this.mainwindow, Gtk.FileChooserAction.OPEN,
+                        Gtk.Stock.OPEN, Gtk.ResponseType.ACCEPT,
+                        Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL);
+                    if (file.run () == Gtk.ResponseType.ACCEPT){
+                        open_file (file.get_uri ());
+                    }
+                    file.destroy ();
+                });
+                cd.clicked.connect ( () => {
+                    open_file ("cdda://");
+                    canvas.get_pipeline ().set_state (Gst.State.PLAYING);
+                    pop.destroy ();
+                });
+                dvd.clicked.connect ( () => {
+                    open_file ("dvd://");
+                    canvas.get_pipeline ().set_state (Gst.State.PLAYING);
+                    pop.destroy ();
+                });
+                net.clicked.connect ( () => {
+                    var entry = new Gtk.Entry ();
+                    entry.secondary_icon_stock = Gtk.Stock.OPEN;
+                    entry.icon_release.connect ( (pos, e) => {
+                        open_file (entry.text);
+                        canvas.get_pipeline ().set_state (Gst.State.PLAYING);
+                        pop.destroy ();
+                    });
+                    box.remove (net);
+                    box.attach (entry, 1, 3, 1, 1);
+                    entry.show ();
+                });
+                
+                box.attach (fil_i, 0, 0, 1, 1);
+                box.attach (fil,   1, 0, 1, 1);
+                box.attach (dvd_i, 0, 1, 1, 1);
+                box.attach (dvd,   1, 1, 1, 1);
+                box.attach (cd_i,  0, 2, 1, 1);
+                box.attach (cd,    1, 2, 1, 1);
+                box.attach (net_i, 0, 3, 1, 1);
+                box.attach (net,   1, 3, 1, 1);
+                
+                pop.move_to_widget (open);
+                pop.show_all ();
+                pop.present ();
+                pop.run ();
+                pop.destroy ();
+            });
+            
+            play.clicked.connect  ( () => {toggle_play (true);});
+            pause.clicked.connect ( () => {toggle_play (false);});
+            
+            unfullscreen.clicked.connect (toggle_fullscreen);
+            
+            info.toggled.connect ( () => {
+                if (info.active)
+                    tagview.expand ();
+                else
+                    tagview.collapse ();
+            });
+            
+            //fullscreen on maximize
+            this.mainwindow.window_state_event.connect ( (e) => {
+                if (!((e.window.get_state () & Gdk.WindowState.MAXIMIZED) == 0) && !this.fullscreened){
+                    this.mainwindow.fullscreen ();
+                    this.fullscreened = true;
+                    toolbar.insert (unfullscreen, 4);
+                    unfullscreen.show_all ();
+                    return true;
+                }
+                return false;
+            });
+            
+            //positioning
+            this.just_opened = true;int old_h=0, old_w=0;
+            this.mainwindow.size_allocate.connect ( () => {
+                if (this.mainwindow.get_allocated_width () != old_w || 
+                    this.mainwindow.get_allocated_height () != old_h){
+                    this.place ();
+                    old_w = this.mainwindow.get_allocated_width  ();
+                    old_h = this.mainwindow.get_allocated_height ();
+                }
+                return;
+            });
+            
+            this.mainwindow.show_all ();
+            
+            /*DnD*/
+            Gtk.TargetEntry uris = {"text/uri-list", 0, 0};
+            Gtk.drag_dest_set (this.mainwindow, 
+                Gtk.DestDefaults.ALL, {uris}, Gdk.DragAction.MOVE);
+            this.mainwindow.drag_data_received.connect ( (ctx, x, y, sel, info, time) => {
+                for (var i=0;i<sel.get_uris ().length; i++)
+                    this.tagview.add_play_item (sel.get_uris ()[i]);
+                this.open_file (sel.get_uris ()[0]);
+                this.toggle_play (true);
+            });
+        }
+        
+        private void toggle_play (bool start){
+            Gst.State state;
+            canvas.get_pipeline ().get_state (out state, null, 0);
+            if (!start){
+                toolbar.remove (this.pause);
+                toolbar.insert (this.play, 0);
+                play.show_all ();
+                canvas.get_pipeline ().set_state (Gst.State.PAUSED);
+                Source.remove (this.hiding_timer);
+            }else{
+                if (this.reached_end){
+                    canvas.progress = 0.0;
+                    this.reached_end = false;
+                }
+                canvas.get_pipeline ().set_state (Gst.State.PLAYING);
+                toolbar.remove (this.play);
+                toolbar.insert (this.pause, 0);
+                pause.show_all ();
+                this.place ();
+                Source.remove (this.hiding_timer);
+                this.hiding_timer = GLib.Timeout.add (2000, () => {
+                    this.mainwindow.get_window ().set_cursor (blank_cursor);
+                    float y2 = this.stage.height;
+                    this.bar.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 1000, y:y2);
+                    return false;
+                });
+            }
+            this.place ();
+        }
+        
+        private void toggle_fullscreen (){
+            if (fullscreened){
+                this.mainwindow.unmaximize ();
+                this.mainwindow.unfullscreen ();
+                this.fullscreened = false;
+                this.toolbar.remove (this.unfullscreen);
+            }else{
+                this.mainwindow.fullscreen ();
+                this.toolbar.insert (this.unfullscreen, 3);
+                this.unfullscreen.show_all ();
+                this.fullscreened = true;
+            }
+        }
+        
+        internal void open_file (string filename){
+            var uri = File.new_for_commandline_arg (filename).get_uri ();
+            canvas.uri = uri;
+            canvas.audio_volume = 1.0;
+            this.just_opened = true;
+            previewer.uri = uri;
+            previewer.audio_volume = 0.0;
+            
+            mainwindow.title = get_basename (uri);
+            mainwindow.title = mainwindow.title.replace ("%20", " ").
+                replace ("%5B", "[").replace ("%5D", "]").replace ("%7B", "{").
+                replace ("%7D", "}").replace ("_", " ").replace ("."," ").replace ("  "," ");
+            tagview.get_tags (uri, true);
+            
+            play.sensitive  = true;
+            
+            Timeout.add (100, () => {this.place ();return false;});
+            
+            this.toggle_play (true);
+        }
+        
+        private void place (){
+            this.tagview.height   = stage.height;
+            this.tagview.x        = (this.tagview.expanded)?stage.width-this.tagview.width:stage.width;
+            
+            var tb_height = 56;
+            this.bar.width  = stage.width;
+            this.bar.y      = stage.height - tb_height;
+            this.bar.height = tb_height;
+            this.bar.x      = 0;
+            toolbar.width_request = (int)this.bar.width;
+            toolbar.height_request = tb_height;
+            
+            //aspect ratio handling
+            if (this.just_opened && canvas.width == 0.0f){
+                return;
+            }else if (just_opened){
+                canvas.get_base_size (out video_w, out video_h);
+                this.just_opened = false;
+            }
+            if (stage.width > stage.height){
+                this.canvas.height = stage.height;
+                this.canvas.width  = stage.height / video_h * video_w;
+                this.canvas.x      = (stage.width - this.canvas.width) / 2.0f;
+                this.canvas.y      = 0.0f;
+            }else{
+                this.canvas.width  = stage.width;
+                this.canvas.height = stage.width / video_w *  video_h;
+                this.canvas.y      = (stage.height - this.canvas.height) / 2.0f;
+                this.canvas.x      = 0.0f;
+            }
+        }
+        
+        //the application started
+        public override void activate (){
+            
+        }
+        
+        //the application was requested to open some files
+        public override void open (File [] files, string hint){
+            for (var i=0;i<files.length;i++)
+                this.tagview.add_play_item (files[i].get_path ());
+            this.open_file (files[0].get_path ());
+        }
+    }
+}
+
+public static void main (string [] args){
+    Gtk.init (ref args);
+    GtkClutter.init (ref args);
+    ClutterGst.init (ref args);
+    
+    var app = new Audience.AudienceApp ();
+    
+    app.run (args);
+}
+