Merge lp:~audience-members/audience/gtk-3.12 into lp:~audience-members/audience/trunk

[Corentin Noël]

Ported all UI widgets to pure Gtk 3.12

Ported all UI widgets to pure Gtk.

[lp:~audience-members/audience/gtk-3.12]

348. By Corentin Noël on 2014-06-20

Synchronized with trunk.

[Robert Roth (evfool)]

I have tested this branch a few times, felt stable and working. Just for nitpicking: The diff seems a bit hard to read, given that some changes not necessarily related to GTK-3.12 migration have been added (e.g. CMake file splitting per subdir for data and src, generated Makefile removal), those might be better in separate merges, but necessary. If no one else has objections against those being in this one, I'll give this an approve.

review: Abstain

[David Gomes (davidgomes)]

Agreed with Robert here. Corentin, can you explain us if any of these changes included in this branch (mentioned by Robert) have anything to do with GTK+ 3.12?

[Corentin Noël (tintou)]

They are not Gtk3.12 related but they are a full part of the project
reorganization (if you look at the changes, a lot of code has been removed).
Le 21 juin 2014 14:45, "David Gomes" <email address hidden> a écrit :

> Agreed with Robert here. Corentin, can you explain us if any of these
> changes included in this branch (mentioned by Robert) have anything to do
> with GTK+ 3.12?
> --
>
> https://code.launchpad.net/~audience-members/audience/gtk-3.12/+merge/223919
> You proposed lp:~audience-members/audience/gtk-3.12 for merging.
>

[Cody Garver (codygarver)]

- Each video in the playlist is duplicated 01.mkv 01.mkv 02.mkv 02.mkv

- This video doesn't show the controls for me unless I fullscreen then unfullscreen:
  https://slack-files.com/T028SLY6K-F02CDA4MD-c12d7c

- More than 1 video in the playlist requires a scrollbar even if there's available space above

- This video has black bars on the left and right when played windowed:
  https://slack-files.com/T028SLY6K-F02CE461E-df989c

review: Needs Fixing

[Cody Garver (codygarver)]

Also doesn't properly detect/display the Audio and Subtitle of the video with black bars I linked

review: Needs Fixing

[lp:~audience-members/audience/gtk-3.12]

349. By Corentin Noël on 2014-06-30

Multiple Fixes to the interface.

350. By Corentin Noël on 2014-06-30

Fix Aspect not replacing the bottombar.

[Corentin Noël (tintou)]

Cody: I've pushed a fix for the problems you pointed out.

[lp:~audience-members/audience/gtk-3.12]

351. By Cody Garver on 2014-07-06

Add a couple spaces in CMakeLists.txt

352. By Cody Garver on 2014-07-06

Merge in trunk

[Cody Garver (codygarver)]

I'm still getting black bars on left/right of this video in windowed mode https://slack-files.com/T028SLY6K-F02CE461E-df989c

review: Needs Fixing

[Cody Garver (codygarver)]

- Welcome screen does no longer offers to resume last played video

- Welcome screen always offers to play a DVD

review: Needs Fixing

[lp:~audience-members/audience/gtk-3.12]

353. By Cody Garver on 2014-07-06

Restore comment about C warnings

[Cody Garver (codygarver)]

private void on_destroy () has a block of commented out code

review: Needs Fixing

[Corentin Noël (tintou)]

I only have black bars on left/right black bars because the video size>screen size. You maybe have an higher resolution as me.

[lp:~audience-members/audience/gtk-3.12]

354. By Corentin Noël on 2014-07-06

Check if the media is a DVD or BlueRay.

355. By Corentin Noël on 2014-07-06

Fixed saving videos when closing the application.

[Cody Garver (codygarver)]

Every video has black bars on the side, my display resolution is 1080p

[Robert Roth (evfool)]

@Cody Garver: Do you get the black bars only in windowed mode? For FullHD movies (e.g. one MKV anime you've shared on slack) for me the black bars only appear in windowed mode, fullscreen is true fullscreen without black bars.

[Danielle Foré (danrabbit)]

I can confirm that the black bars on the side show up in windowed, but not fullscreen

[Cody Garver (codygarver)]

Well black bars are happening for me with trunk now too. The problem is outside of this branch?

[Robert Roth (evfool)]

It looks that the headerbar is the thing to blame on this branch, commenting the set_titlebar line out fixes the issue.
In case of an 1280x720 video the window size is set to 1280x720 (+decorations) in case there is no headerbar, and with headerbar the size is also set to 1280x720, but that includes the CSD size, so the size allocated to the clutterembed is only 1174x572. The headerbar height for me is 42px, so strangely, that's not the only difference.

[Corentin Noël (tintou)]

For CSD windows, the size also contains shadows so it's maybe linked. In all cases i don't think it's a merge-blocker…

[Cody Garver (codygarver)]

It is indeed export GTK_CSD=1 that causes the bug, not your fault tintou

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2014-05-02 13:04:44 +0000
+++ CMakeLists.txt	2014-07-06 11:18:29 +0000
@@ -4,7 +4,7 @@
 enable_testing ()
 list (APPEND CMAKE_MODULE_PATH ${CMAKE_SOURCE_DIR}/cmake)
 
-project (audience)
+project (audience C)
 
 set (DATADIR ${CMAKE_INSTALL_PREFIX}/share)
 set (PKGDATADIR ${DATADIR}/${CMAKE_PROJECT_NAME})
@@ -18,17 +18,6 @@
 # Comment this out to enable C compiler warnings
 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/)
-
-# Configure file
-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")
@@ -38,54 +27,9 @@
 include (CPack)
 add_custom_target (dist COMMAND ${CMAKE_MAKE_PROGRAM} package_source)
 
-find_package (PkgConfig)
-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
-    ${CMAKE_BINARY_DIR}/src/Config.vala
-    src/Audience.vala
-    src/Consts.vala
-    src/desktop-launcher.vala
-    src/Settings.vala
-    src/Utils.vala
-    src/Widgets/Button.vala
-    src/Widgets/ControlsBar.vala
-    src/Widgets/LLabel.vala
-    src/Widgets/MediaSlider.vala
-    src/Widgets/Playlist.vala
-    src/Widgets/TagView.vala
-    src/Widgets/TopPanel.vala
-    src/Widgets/VideoPlayer.vala
-PACKAGES
-    clutter-gtk-1.0
-    granite
-    gdk-x11-3.0
-    gstreamer-1.0
-    gstreamer-pbutils-1.0
-    gstreamer-tag-1.0
-OPTIONS
-    --enable-experimental
-    --target-glib=2.32
-    --thread
-    -g
-)
-
-
-include (GSettings)
-add_schema ("data/org.pantheon.audience.gschema.xml")
-
+add_subdirectory (src)
+add_subdirectory (data)
 add_subdirectory (po)
-add_executable (${CMAKE_PROJECT_NAME} ${VALA_C})
-install (TARGETS ${CMAKE_PROJECT_NAME} RUNTIME DESTINATION bin)
 
 # uninstall target
 configure_file (

=== added file 'cmake/FindGirCompiler.cmake'
--- cmake/FindGirCompiler.cmake	1970-01-01 00:00:00 +0000
+++ cmake/FindGirCompiler.cmake	2014-07-06 11:18:29 +0000
@@ -0,0 +1,56 @@
+##
+# 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 Gir compiler (g-ir-compiler)
+#
+# This module determines wheter a Gir compiler is installed on the current
+# system and where its executable is.
+#
+# Call the module using "find_package(GirCompiler) from within your CMakeLists.txt.
+#
+# The following variables will be set after an invocation:
+#
+#  G_IR_COMPILER_FOUND       Whether the g-ir-compiler compiler has been found or not
+#  G_IR_COMPILER_EXECUTABLE  Full path to the g-ir-compiler executable if it has been found
+##
+
+
+# Search for the g-ir-compiler executable in the usual system paths.
+find_program (G_IR_COMPILER_EXECUTABLE
+  NAMES g-ir-compiler)
+
+# Handle the QUIETLY and REQUIRED arguments, which may be given to the find call.
+# Furthermore set G_IR_COMPILER_FOUND to TRUE if the g-ir-compiler has been found (aka.
+# G_IR_COMPILER_EXECUTABLE is set)
+
+include (FindPackageHandleStandardArgs)
+find_package_handle_standard_args (GirCompiler DEFAULT_MSG G_IR_COMPILER_EXECUTABLE)
+
+mark_as_advanced (G_IR_COMPILER_EXECUTABLE)

=== added file 'cmake/GObjectIntrospectionMacros.cmake'
--- cmake/GObjectIntrospectionMacros.cmake	1970-01-01 00:00:00 +0000
+++ cmake/GObjectIntrospectionMacros.cmake	2014-07-06 11:18:29 +0000
@@ -0,0 +1,34 @@
+macro(add_target_gir TARGET_NAME GIR_NAME HEADER CFLAGS GRANITE_VERSION)
+    set(PACKAGES "")
+    foreach(PKG ${ARGN})
+        set(PACKAGES ${PACKAGES} --include=${PKG})
+    endforeach()
+    install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\")
+    execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME}
+            --quiet
+            --library ${TARGET_NAME} ${PACKAGES}
+            -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir
+            -L${CMAKE_CURRENT_BINARY_DIR}
+            --nsversion=${GRANITE_VERSION} ${HEADER})")
+    install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)")
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/)
+endmacro()
+
+macro(add_target_gir_with_executable TARGET_NAME EXE_NAME GIR_NAME HEADER EXE_HEADER CFLAGS GRANITE_VERSION)
+    set(PACKAGES "")
+    foreach(PKG ${ARGN})
+        set(PACKAGES ${PACKAGES} --include=${PKG})
+    endforeach()
+    install(CODE "set(ENV{LD_LIBRARY_PATH} \"${CMAKE_CURRENT_BINARY_DIR}:\$ENV{LD_LIBRARY_PATH}\")
+    execute_process(COMMAND g-ir-scanner ${CFLAGS} -n ${GIR_NAME}
+            --quiet
+            --library ${TARGET_NAME} --program ${EXE_NAME} ${PACKAGES}
+            -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir
+            -L${CMAKE_CURRENT_BINARY_DIR}
+            -I${CMAKE_CURRENT_BINARY_DIR}
+            --nsversion=${GRANITE_VERSION} ${HEADER} ${EXE_HEADER})")
+    install(CODE "execute_process(COMMAND g-ir-compiler ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir -o ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib)")
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.gir DESTINATION share/gir-1.0/)
+    install(FILES ${CMAKE_CURRENT_BINARY_DIR}/${GIR_NAME}-${GRANITE_VERSION}.typelib DESTINATION lib/girepository-1.0/)
+endmacro()

=== removed file 'cmake/Makefile'
--- cmake/Makefile	2011-12-13 18:08:48 +0000
+++ cmake/Makefile	1970-01-01 00:00:00 +0000
@@ -1,286 +0,0 @@
-# CMAKE generated file: DO NOT EDIT!
-# Generated by "Unix Makefiles" Generator, CMake Version 2.8
-
-# Default target executed when no arguments are given to make.
-default_target: all
-.PHONY : default_target
-
-#=============================================================================
-# Special targets provided by cmake.
-
-# Disable implicit rules so canoncical targets will work.
-.SUFFIXES:
-
-# Remove some rules from gmake that .SUFFIXES does not remove.
-SUFFIXES =
-
-.SUFFIXES: .hpux_make_needs_suffix_list
-
-# Suppress display of executed commands.
-$(VERBOSE).SILENT:
-
-# A target that is always out of date.
-cmake_force:
-.PHONY : cmake_force
-
-#=============================================================================
-# Set environment variables for the build.
-
-# The shell in which to execute make rules.
-SHELL = /bin/sh
-
-# The CMake executable.
-CMAKE_COMMAND = /usr/bin/cmake
-
-# The command to remove a file.
-RM = /usr/bin/cmake -E remove -f
-
-# The top-level source directory on which CMake was run.
-CMAKE_SOURCE_DIR = /home/mefrio/Scrivania/cmake
-
-# The top-level build directory on which CMake was run.
-CMAKE_BINARY_DIR = /home/mefrio/Scrivania/cmake/cmake
-
-#=============================================================================
-# Targets provided globally by CMake.
-
-# Special rule for the target edit_cache
-edit_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running interactive CMake command-line interface..."
-	/usr/bin/cmake -i .
-.PHONY : edit_cache
-
-# Special rule for the target edit_cache
-edit_cache/fast: edit_cache
-.PHONY : edit_cache/fast
-
-# Special rule for the target install
-install: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/bin/cmake -P cmake_install.cmake
-.PHONY : install
-
-# Special rule for the target install
-install/fast: preinstall/fast
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Install the project..."
-	/usr/bin/cmake -P cmake_install.cmake
-.PHONY : install/fast
-
-# Special rule for the target install/local
-install/local: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing only the local directory..."
-	/usr/bin/cmake -DCMAKE_INSTALL_LOCAL_ONLY=1 -P cmake_install.cmake
-.PHONY : install/local
-
-# Special rule for the target install/local
-install/local/fast: install/local
-.PHONY : install/local/fast
-
-# Special rule for the target install/strip
-install/strip: preinstall
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Installing the project stripped..."
-	/usr/bin/cmake -DCMAKE_INSTALL_DO_STRIP=1 -P cmake_install.cmake
-.PHONY : install/strip
-
-# Special rule for the target install/strip
-install/strip/fast: install/strip
-.PHONY : install/strip/fast
-
-# Special rule for the target list_install_components
-list_install_components:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Available install components are: \"Unspecified\""
-.PHONY : list_install_components
-
-# Special rule for the target list_install_components
-list_install_components/fast: list_install_components
-.PHONY : list_install_components/fast
-
-# Special rule for the target rebuild_cache
-rebuild_cache:
-	@$(CMAKE_COMMAND) -E cmake_echo_color --switch=$(COLOR) --cyan "Running CMake to regenerate build system..."
-	/usr/bin/cmake -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR)
-.PHONY : rebuild_cache
-
-# Special rule for the target rebuild_cache
-rebuild_cache/fast: rebuild_cache
-.PHONY : rebuild_cache/fast
-
-# The main all target
-all: cmake_check_build_system
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/mefrio/Scrivania/cmake/cmake/CMakeFiles /home/mefrio/Scrivania/cmake/cmake/CMakeFiles/progress.marks
-	$(MAKE) -f CMakeFiles/Makefile2 all
-	$(CMAKE_COMMAND) -E cmake_progress_start /home/mefrio/Scrivania/cmake/cmake/CMakeFiles 0
-.PHONY : all
-
-# The main clean target
-clean:
-	$(MAKE) -f CMakeFiles/Makefile2 clean
-.PHONY : clean
-
-# The main clean target
-clean/fast: clean
-.PHONY : clean/fast
-
-# Prepare targets for installation.
-preinstall: all
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall
-
-# Prepare targets for installation.
-preinstall/fast:
-	$(MAKE) -f CMakeFiles/Makefile2 preinstall
-.PHONY : preinstall/fast
-
-# clear depends
-depend:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 1
-.PHONY : depend
-
-#=============================================================================
-# Target rules for targets named scratch
-
-# Build rule for target.
-scratch: cmake_check_build_system
-	$(MAKE) -f CMakeFiles/Makefile2 scratch
-.PHONY : scratch
-
-# fast build rule for target.
-scratch/fast:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/build
-.PHONY : scratch/fast
-
-src/entry.o: src/entry.c.o
-.PHONY : src/entry.o
-
-# target to build an object file
-src/entry.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.o
-.PHONY : src/entry.c.o
-
-src/entry.i: src/entry.c.i
-.PHONY : src/entry.i
-
-# target to preprocess a source file
-src/entry.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.i
-.PHONY : src/entry.c.i
-
-src/entry.s: src/entry.c.s
-.PHONY : src/entry.s
-
-# target to generate assembly for a file
-src/entry.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/entry.c.s
-.PHONY : src/entry.c.s
-
-src/main_window.o: src/main_window.c.o
-.PHONY : src/main_window.o
-
-# target to build an object file
-src/main_window.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.o
-.PHONY : src/main_window.c.o
-
-src/main_window.i: src/main_window.c.i
-.PHONY : src/main_window.i
-
-# target to preprocess a source file
-src/main_window.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.i
-.PHONY : src/main_window.c.i
-
-src/main_window.s: src/main_window.c.s
-.PHONY : src/main_window.s
-
-# target to generate assembly for a file
-src/main_window.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/main_window.c.s
-.PHONY : src/main_window.c.s
-
-src/menu.o: src/menu.c.o
-.PHONY : src/menu.o
-
-# target to build an object file
-src/menu.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.o
-.PHONY : src/menu.c.o
-
-src/menu.i: src/menu.c.i
-.PHONY : src/menu.i
-
-# target to preprocess a source file
-src/menu.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.i
-.PHONY : src/menu.c.i
-
-src/menu.s: src/menu.c.s
-.PHONY : src/menu.s
-
-# target to generate assembly for a file
-src/menu.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/menu.c.s
-.PHONY : src/menu.c.s
-
-src/notebook.o: src/notebook.c.o
-.PHONY : src/notebook.o
-
-# target to build an object file
-src/notebook.c.o:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.o
-.PHONY : src/notebook.c.o
-
-src/notebook.i: src/notebook.c.i
-.PHONY : src/notebook.i
-
-# target to preprocess a source file
-src/notebook.c.i:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.i
-.PHONY : src/notebook.c.i
-
-src/notebook.s: src/notebook.c.s
-.PHONY : src/notebook.s
-
-# target to generate assembly for a file
-src/notebook.c.s:
-	$(MAKE) -f CMakeFiles/scratch.dir/build.make CMakeFiles/scratch.dir/src/notebook.c.s
-.PHONY : src/notebook.c.s
-
-# Help Target
-help:
-	@echo "The following are some of the valid targets for this Makefile:"
-	@echo "... all (the default if no target is provided)"
-	@echo "... clean"
-	@echo "... depend"
-	@echo "... edit_cache"
-	@echo "... install"
-	@echo "... install/local"
-	@echo "... install/strip"
-	@echo "... list_install_components"
-	@echo "... rebuild_cache"
-	@echo "... scratch"
-	@echo "... src/entry.o"
-	@echo "... src/entry.i"
-	@echo "... src/entry.s"
-	@echo "... src/main_window.o"
-	@echo "... src/main_window.i"
-	@echo "... src/main_window.s"
-	@echo "... src/menu.o"
-	@echo "... src/menu.i"
-	@echo "... src/menu.s"
-	@echo "... src/notebook.o"
-	@echo "... src/notebook.i"
-	@echo "... src/notebook.s"
-.PHONY : help
-
-
-
-#=============================================================================
-# Special targets to cleanup operation of make.
-
-# Special rule to run CMake to check the build system integrity.
-# No rule that depends on this can have commands that come from listfiles
-# because they might be regenerated.
-cmake_check_build_system:
-	$(CMAKE_COMMAND) -H$(CMAKE_SOURCE_DIR) -B$(CMAKE_BINARY_DIR) --check-build-system CMakeFiles/Makefile.cmake 0
-.PHONY : cmake_check_build_system
-

=== modified file 'cmake/Translations.cmake'
--- cmake/Translations.cmake	2012-06-07 15:38:06 +0000
+++ cmake/Translations.cmake	2014-07-06 11:18:29 +0000
@@ -20,22 +20,47 @@
     add_custom_target (pot COMMENT “Building translation catalog.”)
     find_program (XGETTEXT_EXECUTABLE xgettext)
 
-
     set(C_SOURCE "")
+    set(VALA_SOURCE "")
+    set(GLADE_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})
+        set(BASE_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${FILES_INPUT})
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.c)
+        foreach(C_FILE ${SOURCE_FILES})
+            set(C_SOURCE ${C_SOURCE} ${C_FILE})
+        endforeach()
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.vala)
+        foreach(VALA_C_FILE ${SOURCE_FILES})
+            set(VALA_SOURCE ${VALA_SOURCE} ${VALA_C_FILE})
+        endforeach()
+
+        file (GLOB_RECURSE SOURCE_FILES RELATIVE ${CMAKE_CURRENT_SOURCE_DIR}/ ${BASE_DIRECTORY}/*.ui)
+        foreach(GLADE_C_FILE ${SOURCE_FILES})
+            set(GLADE_SOURCE ${GLADE_SOURCE} ${GLADE_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="_" --keyword="N_" --from-code=UTF-8
-        )
+    set(BASE_XGETTEXT_COMMAND
+        ${XGETTEXT_EXECUTABLE} -d ${NLS_PACKAGE}
+        -o ${CMAKE_CURRENT_SOURCE_DIR}/${NLS_PACKAGE}.pot
+        --add-comments="/" --keyword="_" --keyword="N_" --keyword="C_:1c,2" --keyword="NC_:1c,2" --keyword="ngettext:1,2" --keyword="Q_:1g" --from-code=UTF-8)
+
+   set(CONTINUE_FLAG "")
+
+    IF(NOT "${C_SOURCE}" STREQUAL "")
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${C_SOURCE})
+        set(CONTINUE_FLAG "-j")
+    ENDIF()
+
+    IF(NOT "${VALA_SOURCE}" STREQUAL "")
+        add_custom_command(TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LC\# ${VALA_SOURCE})
+        set(CONTINUE_FLAG "-j")
+    ENDIF()
+
+    IF(NOT "${GLADE_SOURCE}" STREQUAL "")
+        add_custom_command (TARGET pot WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} COMMAND ${BASE_XGETTEXT_COMMAND} ${CONTINUE_FLAG} -LGlade ${GLADE_SOURCE})
+    ENDIF()  
 endmacro()

=== modified file 'cmake/ValaPrecompile.cmake'
--- cmake/ValaPrecompile.cmake	2012-02-23 20:42:55 +0000
+++ cmake/ValaPrecompile.cmake	2014-07-06 11:18:29 +0000
@@ -1,5 +1,6 @@
 ##
 # Copyright 2009-2010 Jakob Westhoff. All rights reserved.
+# Copyright 2012 elementary.
 # 
 # Redistribution and use in source and binary forms, with or without
 # modification, are permitted provided that the following conditions are met:
@@ -74,10 +75,18 @@
 #   be a header file as well as an internal header file being generated called
 #   <provided_name>.h and <provided_name>_internal.h
 #
+# GENERATE_GIR
+#   Have the compiler generate a GObject-Introspection repository file with
+#   name: <provided_name>.gir. This can be later used to create a binary typelib
+#   using the GI compiler.
+#
+# GENERATE_SYMBOLS
+#   Output a <provided_name>.symbols file containing all the exported symbols.
+# 
 # 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
+#   vala_precompile(VALA_C mytargetname
 #       source1.vala
 #       source2.vala
 #       source3.vala
@@ -95,14 +104,19 @@
 #       myvapi
 #   GENERATE_HEADER
 #       myheader
+#   GENERATE_GIR
+#       mygir
+#   GENERATE_SYMBOLS
+#       mysymbols
 #   )
 #
 # 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})
+macro(vala_precompile output target_name)
+    parse_arguments(ARGS "TARGET;PACKAGES;OPTIONS;DIRECTORY;GENERATE_GIR;GENERATE_SYMBOLS;GENERATE_HEADER;GENERATE_VAPI;CUSTOM_VAPIS" "" ${ARGN})
+
     if(ARGS_DIRECTORY)
         set(DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}/${ARGS_DIRECTORY})
     else(ARGS_DIRECTORY)
@@ -115,15 +129,17 @@
     endforeach(pkg ${ARGS_PACKAGES})
     set(in_files "")
     set(out_files "")
+    set(out_files_display "")
     set(${output} "")
+
     foreach(src ${ARGS_DEFAULT_ARGS})
-        string(REPLACE ${CMAKE_CURRENT_SOURCE_DIR}/ "" src ${src})
         string(REGEX MATCH "^/" IS_MATCHED ${src})
         if(${IS_MATCHED} MATCHES "/")
-            list(APPEND in_files "${src}")
+            set(src_file_path ${src})
         else()
-            list(APPEND in_files "${CMAKE_CURRENT_SOURCE_DIR}/${src}")
+            set(src_file_path ${CMAKE_CURRENT_SOURCE_DIR}/${src})
         endif()
+        list(APPEND in_files ${src_file_path})
         string(REPLACE ".vala" ".c" src ${src})
         string(REPLACE ".gs" ".c" src ${src})
         if(${IS_MATCHED} MATCHES "/")
@@ -135,6 +151,7 @@
             list(APPEND out_files "${DIRECTORY}/${src}")
         endif()
         list(APPEND ${output} ${out_file})
+        list(APPEND out_files_display "${src}")
     endforeach(src ${ARGS_DEFAULT_ARGS})
 
     set(custom_vapi_arguments "")
@@ -151,7 +168,8 @@
     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")
+        list(APPEND out_files_display "${ARGS_GENERATE_VAPI}.vapi")
+        set(vapi_arguments "--library=${ARGS_GENERATE_VAPI}" "--vapi=${ARGS_GENERATE_VAPI}.vapi")
 
         # Header and internal header is needed to generate internal vapi
         if (NOT ARGS_GENERATE_HEADER)
@@ -162,26 +180,71 @@
     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")
+        list(APPEND out_files_display "${ARGS_GENERATE_HEADER}.h")
+        list(APPEND header_arguments "--header=${ARGS_GENERATE_HEADER}.h")
     endif(ARGS_GENERATE_HEADER)
 
-    add_custom_command(OUTPUT ${out_files} 
+    set(gir_arguments "")
+    set(gircomp_command "")
+    if(ARGS_GENERATE_GIR)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir")
+        list(APPEND out_files_display "${ARGS_GENERATE_GIR}.gir")
+        set(gir_arguments "--gir=${ARGS_GENERATE_GIR}.gir")
+
+        include (FindGirCompiler)
+        find_package(GirCompiler REQUIRED)
+        
+        set(gircomp_command 
+            COMMAND 
+                ${G_IR_COMPILER_EXECUTABLE}
+            ARGS 
+                "${DIRECTORY}/${ARGS_GENERATE_GIR}.gir"
+                -o "${DIRECTORY}/${ARGS_GENERATE_GIR}.typelib")
+    endif(ARGS_GENERATE_GIR)
+
+    set(symbols_arguments "")
+    if(ARGS_GENERATE_SYMBOLS)
+        list(APPEND out_files "${DIRECTORY}/${ARGS_GENERATE_SYMBOLS}.symbols")
+        list(APPEND out_files_display "${ARGS_GENERATE_SYMBOLS}.symbols")
+        set(symbols_arguments "--symbols=${ARGS_GENERATE_SYMBOLS}.symbols")
+    endif(ARGS_GENERATE_SYMBOLS)
+
+    # Workaround for a bug that would make valac run twice. This file is written
+    # after the vala compiler generates C source code.
+    set(OUTPUT_STAMP ${CMAKE_CURRENT_BINARY_DIR}/${target_name}_valac.stamp)
+
+    add_custom_command(
+    OUTPUT
+        ${OUTPUT_STAMP}
     COMMAND 
         ${VALA_EXECUTABLE} 
     ARGS 
         "-C" 
         ${header_arguments} 
-        ${vapi_arguments}
+        ${vapi_arguments} 
+        ${gir_arguments} 
+        ${symbols_arguments} 
         "-b" ${CMAKE_CURRENT_SOURCE_DIR} 
         "-d" ${DIRECTORY} 
         ${vala_pkg_opts} 
         ${ARGS_OPTIONS} 
+        "-g"
+        "--save-temps"
         ${in_files} 
         ${custom_vapi_arguments}
+    COMMAND
+        touch
+    ARGS
+        ${OUTPUT_STAMP}
     DEPENDS 
         ${in_files} 
         ${ARGS_CUSTOM_VAPIS}
+    COMMENT
+        "Generating ${out_files_display}"
+    ${gircomp_command}
     )
+
+    # This command will be run twice for some reason (pass a non-empty string to COMMENT
+    # in order to see it). Since valac is not executed from here, this won't be a problem.
+    add_custom_command(OUTPUT ${out_files} DEPENDS ${OUTPUT_STAMP} COMMENT "")
 endmacro(vala_precompile)

=== added file 'data/CMakeLists.txt'
--- data/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ data/CMakeLists.txt	2014-07-06 11:18:29 +0000
@@ -0,0 +1,12 @@
+set (HICOLOR_DIR ${DATADIR}/icons/hicolor)
+# Data
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/16/audience.svg DESTINATION ${HICOLOR_DIR}/16x16/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/24/audience.svg DESTINATION ${HICOLOR_DIR}/24x24/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/32/audience.svg DESTINATION ${HICOLOR_DIR}/32x32/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/48/audience.svg DESTINATION ${HICOLOR_DIR}/48x48/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/64/audience.svg DESTINATION ${HICOLOR_DIR}/64x64/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/icons/128/audience.svg DESTINATION ${HICOLOR_DIR}/128x128/apps/)
+install (FILES ${CMAKE_CURRENT_SOURCE_DIR}/audience.desktop DESTINATION ${DATADIR}/applications/)
+
+include(GSettings)
+add_schema (org.pantheon.audience.gschema.xml)

=== modified file 'data/org.pantheon.audience.gschema.xml'
--- data/org.pantheon.audience.gschema.xml	2013-03-31 21:46:37 +0000
+++ data/org.pantheon.audience.gschema.xml	2014-07-06 11:18:29 +0000
@@ -15,10 +15,15 @@
             <summary>Resume videos</summary>
             <description>Resume video at the point they were stopped when audience was closed</description>
         </key>
-        <key name="last-played-videos" type="s">
-            <default>""</default>
-            <summary>List of last played videos and the time they stopped</summary>
-            <description>A list of the last played and the time they were stopped</description>
+        <key name="last-played-videos" type="as">
+            <default>[]</default>
+            <summary>List of last played videos</summary>
+            <description>A list of the last played</description>
+        </key>
+        <key name="last-stopped" type="d">
+            <default>0</default>
+            <summary>Last stopped time of last played video</summary>
+            <description>Last stopped time of last played video</description>
         </key>
         <key name="last-folder" type="s">
             <default>"-1"</default>
@@ -41,4 +46,4 @@
             <description>Hide the window decorations. You can close the window with escape</description>
         </key>
     </schema>
-</schemalist>
+</schemalist>
\ No newline at end of file

=== modified file 'src/Audience.vala'
--- src/Audience.vala	2014-05-25 13:34:00 +0000
+++ src/Audience.vala	2014-07-06 11:18:29 +0000
@@ -1,3 +1,23 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Tom Beckmann <[e-mail]>
+ *              Cody Garver <[e-mail]>
+ */
 
 /*
 [CCode (cname="gst_navigation_query_parse_commands_length")]
@@ -21,7 +41,7 @@
             build_version = Constants.VERSION;
             build_version_info = Constants.VERSION_INFO;
 
-            app_years = "2011-2013";
+            app_years = "2011-2014";
             app_icon = "audience";
             app_launcher = "audience.desktop";
             application_id = "net.launchpad.audience";
@@ -40,27 +60,32 @@
         }
 
         public Gtk.Window                 mainwindow;
-        public Audience.Widgets.TagView   tagview;
         public GnomeMediaKeys             mediakeys;
         public Audience.Widgets.Playlist  playlist;
         public GtkClutter.Embed           clutter;
         public Granite.Widgets.Welcome    welcome;
-        public Audience.Widgets.VideoPlayer video_player;
-
-        public bool has_dvd;
-
-        public List<string> last_played_videos; //taken from settings, but splitted
+
+        public bool fullscreened { get; set; }
+
+        private Audience.Widgets.VideoPlayer video_player;
+        private Audience.Widgets.BottomBar bottom_bar;
+        private Clutter.Stage stage;
+        private Gtk.Revealer unfullscreen_bar;
+        private GtkClutter.Actor bottom_actor;
+        private GtkClutter.Actor unfullscreen_actor;
+        private bool mouse_primary_down = false;
+        private int bottom_bar_size = 0;
 
         public GLib.VolumeMonitor monitor;
-        
+
         private  const string[] SUBTITLE_EXTENSIONS = {
-														"sub",
-														"srt",
-														"smi",
-														"ssa",
-														"ass",
-														"asc"
-														};
+            "sub",
+            "srt",
+            "smi",
+            "ssa",
+            "ass",
+            "asc"
+        };
 
         public App () {
             Granite.Services.Logger.DisplayLevel = Granite.Services.LogLevel.DEBUG;
@@ -69,148 +94,77 @@
             this.flags |= GLib.ApplicationFlags.HANDLES_OPEN;
         }
 
-        void build ()
-        {
+        void build () {
             playlist = new Widgets.Playlist ();
             settings = new Settings ();
             mainwindow = new Gtk.Window ();
-            video_player = new Widgets.VideoPlayer ();
-            tagview = new Widgets.TagView (this);
-
-            tagview.select_external_subtitle.connect (video_player.set_subtitle_uri);
-
-            var mainbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            video_player = Widgets.VideoPlayer.get_default ();
+            video_player.notify["playing"].connect (() => {bottom_bar.toggle_play_pause ();});
+
             clutter = new GtkClutter.Embed ();
 
-            //prepare last played videos
-            last_played_videos = new List<string> ();
-            var split = settings.last_played_videos.split (",");;
-            for (var i=0;i<split.length;i++){
-                last_played_videos.append (split[i]);
-            }
-
-            has_dvd = Audience.has_dvd ();
-
             if (settings.last_folder == "-1")
                 settings.last_folder = Environment.get_home_dir ();
 
-            welcome = new Granite.Widgets.Welcome (_("No Videos Open"), _("Select a source to begin playing."));
-            var open_file_welcome_index = welcome.append ("document-open", _("Open file"), _("Open a saved file."));
-
-            var filename = last_played_videos.length () > 0 ? last_played_videos.nth_data (0) : "";
-            var last_file = File.new_for_uri (filename);
-
-            var last_video_welcome_index = -1;
-            if (last_file.query_exists ()) {
-                last_video_welcome_index = welcome.append ("media-playback-start", _("Resume last video"), get_title (last_file.get_basename ()));
-                welcome.set_item_visible (last_video_welcome_index, last_played_videos.length () > 0);
-            }
-
-            var dvd_welcome_index = welcome.append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
-            welcome.set_item_visible (dvd_welcome_index, has_dvd);
-
-            var stage = clutter.get_stage ();
+            stage = (Clutter.Stage)clutter.get_stage ();
+            stage.background_color = {0, 0, 0, 0};
+            stage.use_alpha = true;
 
             video_player.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.WIDTH, 0));
             video_player.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.HEIGHT, 0));
 
             stage.add_child (video_player);
-            stage.add_child (tagview);
-            stage.background_color = {0, 0, 0};
-
-            this.tagview.y      = -10;
-            this.tagview.x      = stage.width;
-            this.tagview.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.HEIGHT, -20));
-
+
+            bottom_bar = new Widgets.BottomBar ();
+            bottom_bar.set_valign (Gtk.Align.END);
+            bottom_bar.play_toggled.connect (() => {video_player.playing = !video_player.playing;});
+            bottom_bar.seeked.connect ((val) => {video_player.progress = val;});
+            bottom_bar.unfullscreen.connect (() => {toggle_fullscreen ();});
+
+            //tagview.select_external_subtitle.connect (video_player.set_subtitle_uri);
+
+            unfullscreen_bar = bottom_bar.get_unfullscreen_button ();
+
+            bottom_actor = new GtkClutter.Actor.with_contents (bottom_bar);
+            bottom_actor.opacity = GLOBAL_OPACITY;
+            stage.add_child (bottom_actor);
+
+            unfullscreen_actor = new GtkClutter.Actor.with_contents (unfullscreen_bar);
+            unfullscreen_actor.opacity = GLOBAL_OPACITY;
+            stage.add_child (unfullscreen_actor);
+
+            setup_welcome_screen ();
+
+            var mainbox = new Gtk.Box (Gtk.Orientation.VERTICAL, 0);
+            mainbox.pack_start (clutter);
             mainbox.pack_start (welcome);
-            mainbox.pack_start (clutter);
-
-            this.mainwindow.title = program_name;
-            this.mainwindow.window_position = Gtk.WindowPosition.CENTER;
-            this.mainwindow.set_application (this);
-            this.mainwindow.add (mainbox);
-            this.mainwindow.set_default_size (624, 352);
-            this.mainwindow.show_all ();
+
+            var header = new Gtk.HeaderBar ();
+            header.set_show_close_button (true);
+            header.get_style_context ().remove_class ("header-bar");
+
+            mainwindow.set_titlebar (header);
+
+            mainwindow.events |= Gdk.EventMask.POINTER_MOTION_MASK;
+            mainwindow.events |= Gdk.EventMask.LEAVE_NOTIFY_MASK;
+            mainwindow.events |= Gdk.EventMask.BUTTON_PRESS_MASK;
+            mainwindow.title = program_name;
+            mainwindow.window_position = Gtk.WindowPosition.CENTER;
+            mainwindow.set_application (this);
+            mainwindow.add (mainbox);
+            mainwindow.set_default_size (624, 352);
+            mainwindow.set_size_request (350, 300);
+            mainwindow.show_all ();
             if (!settings.show_window_decoration)
-                this.mainwindow.decorated = false;
+                mainwindow.decorated = false;
 
             clutter.hide ();
 
-            /*events*/
-            video_player.text_tags_changed.connect (tagview.setup_text_setup);
-            video_player.audio_tags_changed.connect (tagview.setup_audio_setup);
-
-            //look for dvd
-            this.monitor = GLib.VolumeMonitor.get ();
-            monitor.drive_connected.connect ( (drive) => {
-                this.has_dvd = Audience.has_dvd ();
-                welcome.set_item_visible (dvd_welcome_index, this.has_dvd);
-            });
-            monitor.drive_disconnected.connect ( () => {
-                this.has_dvd = Audience.has_dvd ();
-                welcome.set_item_visible (dvd_welcome_index, this.has_dvd);
-            });
-            //playlist wants us to open a file
-            playlist.play.connect ( (file) => {
-                this.play_file (file.get_uri ());
-            });
-
-            //handle welcome
-            welcome.activated.connect ( (index) => {
-                if (index == open_file_welcome_index) {
-                    run_open_file ();
-                } else if (index == last_video_welcome_index) {
-                    welcome.hide ();
-                    clutter.show_all ();
-
-                    open_file (filename);
-
-                    video_player.playing = false;
-                    video_player.progress = double.parse (last_played_videos.nth_data (1));
-                    video_player.playing = true;
-                } else if (index == dvd_welcome_index) {
-                    run_open_dvd ();
-                } else {
-                    var d = new Gtk.Dialog.with_buttons (_("Open location"),
-                        this.mainwindow, Gtk.DialogFlags.MODAL,
-                        Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL,
-                        Gtk.Stock.OK,     Gtk.ResponseType.OK);
-
-                    var grid  = new Gtk.Grid ();
-                    var entry = new Gtk.Entry ();
-
-                    grid.attach (new Gtk.Image.from_icon_name ("internet-web-browser",
-                        Gtk.IconSize.DIALOG), 0, 0, 1, 2);
-                    grid.attach (new Gtk.Label (_("Choose location")), 1, 0, 1, 1);
-                    grid.attach (entry, 1, 1, 1, 1);
-
-                    ((Gtk.Container)d.get_content_area ()).add (grid);
-                    grid.show_all ();
-
-                    if (d.run () == Gtk.ResponseType.OK) {
-                        open_file (entry.text, true);
-                        video_player.playing = true;
-                        welcome.hide ();
-                        clutter.show_all ();
-                    }
-                    d.destroy ();
-                }
-
-                int current_state = mainwindow.get_window ().get_state ();
-                bool currently_maximized = (current_state & Gdk.WindowState.MAXIMIZED) != 0;
-
-                // video is playing and we are maximized, go fullscreen
-                if (video_player.playing && currently_maximized) {
-                    mainwindow.fullscreen ();
-                    video_player.fullscreened = true;
-                }
-            });
-
             //media keys
             try {
                 mediakeys = Bus.get_proxy_sync (BusType.SESSION,
                     "org.gnome.SettingsDaemon", "/org/gnome/SettingsDaemon/MediaKeys");
-                mediakeys.MediaPlayerKeyPressed.connect ( (bus, app, key) => {
+                mediakeys.MediaPlayerKeyPressed.connect ((bus, app, key) => {
                     if (app != "audience")
                        return;
                     switch (key) {
@@ -229,138 +183,25 @@
                 });
 
                 mediakeys.GrabMediaPlayerKeys("audience", 0);
-            } catch (Error e) { warning (e.message); }
-
-            //shortcuts
-            this.mainwindow.key_press_event.connect ( (e) => {
-                switch (e.keyval) {
-                    case Gdk.Key.p:
-                    case Gdk.Key.space:
-                        video_player.playing = !video_player.playing;
-                        break;
-                    case Gdk.Key.Escape:
-                        if (video_player.fullscreened)
-                            toggle_fullscreen ();
-                        else
-                            mainwindow.destroy ();
-                        break;
-                    case Gdk.Key.o:
-                        run_open_file ();
-                        break;
-                    case Gdk.Key.f:
-                    case Gdk.Key.F11:
-                        toggle_fullscreen ();
-                        break;
-                    case Gdk.Key.q:
-                        mainwindow.destroy ();
-                        break;
-                    case Gdk.Key.Left:
-                        if ((video_player.progress - 0.05) < 0)
-                            video_player.progress = 0.0;
-                        else
-                            video_player.progress -= 0.05;
-                        break;
-                    case Gdk.Key.Right:
-                        video_player.progress += 0.05;
-                        break;
-                    case Gdk.Key.a:
-                        next_audio ();
-                        break;
-                    case Gdk.Key.s:
-                        next_text ();
-                        break;
-                    default:
-                        break;
-                }
-
-                return true;
+            } catch (Error e) {
+                warning (e.message);
+            }
+
+            /*events*/
+            video_player.text_tags_changed.connect (bottom_bar.preferences_popover.setup_text);
+            video_player.audio_tags_changed.connect (bottom_bar.preferences_popover.setup_audio);
+            video_player.progression_changed.connect ((current_time, total_time) => {
+                bottom_bar.set_progression_time (current_time, total_time);
             });
 
             //end
-            video_player.ended.connect ( () => {
-                Idle.add (()=>{
+            video_player.ended.connect (() => {
+                Idle.add (() => {
                     playlist.next ();
                     return false;
                 });
             });
 
-            /*open location popover*/
-            video_player.show_open_context.connect ( () => {
-                var has_been_stopped = video_player.playing;
-
-                video_player.playing = false;
-
-                if (!has_dvd) { //just one source, so open that one
-                    Timeout.add (300, () => {
-                        run_open_file ();
-                        return false;
-                    });
-                    return;
-                }
-
-                var pop = new Granite.Widgets.PopOver ();
-                var box = new Gtk.Box (Gtk.Orientation.VERTICAL, 6);
-                ((Gtk.Box)pop.get_content_area ()).add (box);
-
-                var fil   = new Gtk.Button.with_label (_("Add from Harddrive"));
-                fil.image = new Gtk.Image.from_icon_name ("document-open", Gtk.IconSize.DIALOG);
-                var dvd   = new Gtk.Button.with_label (_("Play a DVD"));
-                dvd.image = new Gtk.Image.from_icon_name ("media-cdrom", Gtk.IconSize.DIALOG);
-                var net   = new Gtk.Button.with_label (_("Network File"));
-                net.image = new Gtk.Image.from_icon_name ("internet-web-browser", Gtk.IconSize.DIALOG);
-
-                fil.clicked.connect ( () => {
-                    pop.destroy ();
-                    run_open_file ();
-                });
-                dvd.clicked.connect ( () => {
-                    run_open_dvd ();
-                    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);
-                        video_player.playing = true;
-                        pop.destroy ();
-                    });
-                    box.remove (net);
-                    box.reorder_child (entry, 2);
-                    entry.show ();
-                });
-
-                box.pack_start (fil);
-                if (has_dvd)
-                    box.pack_start (dvd);
-                //box.pack_start (net); uri temporary dropped
-
-                /*temporary until popover closing gets fixed*/
-                var canc = new Gtk.Button.from_stock (Gtk.Stock.CANCEL);
-                box.pack_start (canc);
-                canc.clicked.connect ( () => {
-                    pop.destroy ();
-                });
-
-                int x_r, y_r;
-                this.mainwindow.get_window ().get_origin (out x_r, out y_r);
-
-                pop.move_to_coords ((int)(x_r + clutter.get_stage ().width - 50),
-                    (int)(y_r + stage.height - 18));
-
-                pop.show_all ();
-
-                Timeout.add (300, () => { //for some reason this doesn't cause a crash :)
-                    pop.present ();
-                    pop.run ();
-                    pop.destroy ();
-                    if (has_been_stopped)
-                        video_player.playing = true;
-
-                    return false;
-                });
-            });
-
             video_player.error.connect (() => {
                 welcome.show_all ();
                 clutter.hide ();
@@ -375,196 +216,347 @@
                 mainwindow.set_keep_above (video_player.playing && settings.stay_on_top);
             });
 
-            video_player.exit_fullscreen.connect (toggle_fullscreen);
-
-            video_player.toggle_side_pane.connect ((show) => {
-                if (show) {
-                    tagview.expand ();
-                } else {
-                    tagview.collapse ();
-                }
-            });
-
-            video_player.configure_window.connect ((video_w, video_h) => {
-
-                Gdk.Rectangle monitor;
-                var screen = Gdk.Screen.get_default ();
-                screen.get_monitor_geometry (
-                    screen.get_monitor_at_window (mainwindow.get_window ()),
-                    out monitor);
-
-                int width = 0, height = 0;
-                if (monitor.width > video_w && monitor.height > video_h) {
-                    width = (int)video_w;
-                    height = (int)video_h;
-                } else {
-                    width = (int)(monitor.width * 0.9);
-                    height = (int)((double)video_h / video_w * width);
-                }
-
+            notify["fullscreened"].connect (() => {bottom_bar.fullscreen = fullscreened;});
+
+            setup_drag_n_drop ();
+            video_player.configure_window.connect ((video_w, video_h) => {on_configure_window (video_w, video_h);});
+
+            //fullscreen on maximize
+            mainwindow.window_state_event.connect ((e) => {
+                on_window_state_changed (e.window.get_state ());
+                return false;
+            });
+
+            mainwindow.size_allocate.connect ((alloc) => {on_size_allocate (alloc);});
+            mainwindow.motion_notify_event.connect ((event) => {
+                if (event.window == null)
+                    return false;
+
+                if (mouse_primary_down && settings.move_window) {
+                    mouse_primary_down = false;
+                    mainwindow.begin_move_drag (Gdk.BUTTON_PRIMARY,
+                        (int)event.x_root, (int)event.y_root, event.time);
+                }
+
+                Gtk.Allocation allocation;
+                clutter.get_allocation (out allocation);
+                return update_pointer_position (event.y, allocation.height);
+            });
+
+            bottom_bar.time_widget.slider_motion_event.connect ((event) => {
+                int x, y;
+                bottom_bar.translate_coordinates (mainwindow, (int)event.x, (int)event.y, out x, out y);
+                Gtk.Allocation allocation;
+                clutter.get_allocation (out allocation);
+                update_pointer_position (y, allocation.height);
+            });
+
+            mainwindow.button_press_event.connect ((event) => {
+                if (event.type == Gdk.EventType.2BUTTON_PRESS) {
+                    toggle_fullscreen ();
+                }
+
+                if (event.button == Gdk.BUTTON_PRIMARY)
+                    mouse_primary_down = true;
+
+                return false;
+            });
+
+            mainwindow.button_release_event.connect ((event) => {
+                if (event.button == Gdk.BUTTON_PRIMARY)
+                    mouse_primary_down = false;
+
+                return false;
+            });
+
+            mainwindow.leave_notify_event.connect ((event) => {
+                if (event.window == null)
+                    return false;
+
+                Gtk.Allocation allocation;
+                clutter.get_allocation (out allocation);
+                if (event.x == event.window.get_width ())
+                    return update_pointer_position (event.window.get_height (), allocation.height);
+                else if (event.x == 0)
+                    return update_pointer_position (event.window.get_height (), allocation.height);
+                return update_pointer_position (event.y, allocation.height);
+            });
+            //shortcuts
+            this.mainwindow.key_press_event.connect ((e) => {
+                return on_key_press_event (e);
+            });
+
+            //save position in video when not finished playing
+            mainwindow.destroy.connect (() => {on_destroy ();});
+
+            //playlist wants us to open a file
+            playlist.play.connect ((file) => {
+                this.play_file (file.get_uri ());
+            });
+
+            bottom_bar.notify["child-revealed"].connect (() => {
+                if (bottom_bar.child_revealed == true) {
+                    mainwindow.get_window ().set_cursor (null);
+                } else {
+                    mainwindow.get_window ().set_cursor (new Gdk.Cursor (Gdk.CursorType.BLANK_CURSOR));
+                }
+            });
+
+            stage.notify["allocation"].connect (() => {allocate_bottombar ();});
+
+            if (settings.resume_videos == true && settings.last_played_videos.length > 0) {
+                welcome.hide ();
+                clutter.show_all ();
+                foreach (var filename in settings.last_played_videos) {
+                    open_file (filename);
+                }
+
+                video_player.playing = false;
+                video_player.progress = settings.last_stopped;
+                video_player.playing = true;
+            }
+        }
+
+        private void allocate_bottombar () {
+            bottom_actor.width = stage.get_width ();
+            bottom_bar.queue_resize ();
+            bottom_actor.y = stage.get_height () - bottom_bar_size;
+            unfullscreen_actor.y = 6;
+            unfullscreen_actor.x = stage.get_width () - bottom_bar_size - 6;
+        }
+
+        private void setup_welcome_screen () {
+            welcome = new Granite.Widgets.Welcome (_("No Videos Open"), _("Select a source to begin playing."));
+            welcome.append ("document-open", _("Open file"), _("Open a saved file."));
+
+            //welcome.append ("internet-web-browser", _("Open a location"), _("Watch something from the infinity of the internet"));
+            var filename = settings.last_played_videos.length > 0 ? settings.last_played_videos[0] : "";
+            var last_file = File.new_for_path (filename);
+            welcome.append ("media-playback-start", _("Resume last video"), get_title (last_file.get_basename ()));
+            bool show_last_file = settings.last_played_videos.length > 0;
+            if (last_file.query_exists () == false) {
+                show_last_file = false;
+            }
+
+            welcome.set_item_visible (1, show_last_file);
+
+            welcome.append ("media-cdrom", _("Play from Disc"), _("Watch a DVD or open a file from disc"));
+            welcome.set_item_visible (2, false);
+
+            //look for dvd
+            var disk_manager = DiskManager.get_default ();
+            foreach (var volume in disk_manager.get_volumes ()) {
+                welcome.set_item_visible (2, true);
+            }
+
+            disk_manager.volume_found.connect ((vol) => {
+                welcome.set_item_visible (2, true);
+            });
+
+            disk_manager.volume_removed.connect ((vol) => {
+                if (disk_manager.get_volumes ().length () <= 0)
+                    welcome.set_item_visible (2, false);
+            });
+
+            //handle welcome
+            welcome.activated.connect ((index) => {
+                switch (index) {
+                    case 0:
+                        run_open_file ();
+                        break;
+                    case 1:
+                        welcome.hide ();
+                        clutter.show_all ();
+                        open_file (filename);
+                        video_player.playing = false;
+                        video_player.progress = settings.last_stopped;
+                        video_player.playing = true;
+                        break;
+                    case 2:
+                        run_open_dvd ();
+                        break;
+                    default:
+                        var d = new Gtk.Dialog.with_buttons (_("Open location"),
+                            this.mainwindow, Gtk.DialogFlags.MODAL,
+                            _("Cancel"), Gtk.ResponseType.CANCEL,
+                            _("OK"),     Gtk.ResponseType.OK);
+
+                        var grid  = new Gtk.Grid ();
+                        var entry = new Gtk.Entry ();
+
+                        grid.attach (new Gtk.Image.from_icon_name ("internet-web-browser",
+                            Gtk.IconSize.DIALOG), 0, 0, 1, 2);
+                        grid.attach (new Gtk.Label (_("Choose location")), 1, 0, 1, 1);
+                        grid.attach (entry, 1, 1, 1, 1);
+
+                        ((Gtk.Container)d.get_content_area ()).add (grid);
+                        grid.show_all ();
+
+                        if (d.run () == Gtk.ResponseType.OK) {
+                            open_file (entry.text, true);
+                            video_player.playing = true;
+                            welcome.hide ();
+                            clutter.show_all ();
+                        }
+
+                        d.destroy ();
+                        break;
+                    }
+
+                int current_state = mainwindow.get_window ().get_state ();
+                bool currently_maximized = (current_state & Gdk.WindowState.MAXIMIZED) != 0;
+
+                // video is playing and we are maximized, go fullscreen
+                if (video_player.playing && currently_maximized) {
+                    mainwindow.fullscreen ();
+                    fullscreened = true;
+                }
+            });
+        }
+
+        private bool on_key_press_event (Gdk.EventKey e) {
+            switch (e.keyval) {
+                case Gdk.Key.p:
+                case Gdk.Key.space:
+                    video_player.playing = !video_player.playing;
+                    break;
+                case Gdk.Key.Escape:
+                    if (fullscreened)
+                        toggle_fullscreen ();
+                    else
+                        mainwindow.destroy ();
+                    break;
+                case Gdk.Key.o:
+                    run_open_file ();
+                    break;
+                case Gdk.Key.f:
+                case Gdk.Key.F11:
+                    toggle_fullscreen ();
+                    break;
+                case Gdk.Key.q:
+                    mainwindow.destroy ();
+                    break;
+                case Gdk.Key.Left:
+                    if ((video_player.progress - 0.05) < 0)
+                        video_player.progress = 0.0;
+                    else
+                        video_player.progress -= 0.05;
+                    break;
+                case Gdk.Key.Right:
+                    video_player.progress += 0.05;
+                    break;
+                case Gdk.Key.a:
+                    bottom_bar.preferences_popover.next_audio ();
+                    break;
+                case Gdk.Key.s:
+                    bottom_bar.preferences_popover.next_text ();
+                    break;
+                default:
+                    break;
+            }
+
+            return true;
+        }
+
+        private void on_configure_window (uint video_w, uint video_h) {
+            Gdk.Rectangle monitor;
+            var screen = Gdk.Screen.get_default ();
+            screen.get_monitor_geometry (screen.get_monitor_at_window (mainwindow.get_window ()), out monitor);
+
+            int width = 0, height = 0;
+            if (monitor.width > video_w && monitor.height > video_h) {
+                width = (int)video_w;
+                height = (int)video_h;
+            } else {
+                width = (int)(monitor.width * 0.9);
+                height = (int)((double)video_h / video_w * width);
+            }
+
+            mainwindow.get_window ().move_resize (monitor.width / 2 - width / 2 + monitor.x,
+                monitor.height / 2 - height / 2 + monitor.y,
+                width, height);
+
+            if (settings.keep_aspect) {
                 var geom = Gdk.Geometry ();
-                if (settings.keep_aspect) {
-                    geom.min_aspect = geom.max_aspect = video_w / (double)video_h;
-                } else {
-                    geom.min_aspect = 0.0;
-                    geom.max_aspect = 99999999.0;
-                }
-
-                mainwindow.get_window ().move_resize (monitor.width / 2 - width / 2 + monitor.x,
-                    monitor.height / 2 - height / 2 + monitor.y,
-                    width, height);
-
-                if (settings.keep_aspect) {
-                    mainwindow.get_window ().set_geometry_hints (geom, Gdk.WindowHints.ASPECT);
-                }
-
-            });
-
-            //fullscreen on maximize
-            mainwindow.window_state_event.connect ( (e) => {
-                bool currently_maximized = (e.window.get_state () & Gdk.WindowState.MAXIMIZED) == 0;
-
-                if (!currently_maximized && !video_player.fullscreened && !welcome.is_visible ()) {
-                    mainwindow.fullscreen ();
-                    video_player.fullscreened = true;
-
-                    return true;
-                }
-                return false;
-            });
-
-            //positioning
-            int old_h = - 1;
-            int old_w = - 1;
-            mainwindow.size_allocate.connect ( (alloc) => {
-                if (alloc.width != old_w ||
-                    alloc.height != old_h) {
-                    if (video_player.relayout ()) {
-                        old_w = alloc.width;
-                        old_h = alloc.height;
-                    }
-                }
-
-                tagview.x = tagview.expanded ? stage.width - tagview.width + 10 : stage.width;
-            });
-
-            /*moving the window by drag, fullscreen for dbl-click*/
-            bool down = false;
-            bool moving = false;
-            video_player.button_press_event.connect ( (e) => {
-                if (e.click_count > 1) {
-                    toggle_fullscreen ();
-                    down = false;
-                    return true;
-                } else {
-                    down = true;
-                    return true;
-                }
-            });
-            clutter.motion_notify_event.connect ( (e) => {
-                if (down && settings.move_window) {
-                    down = false;
-                    moving = true;
-                    mainwindow.begin_move_drag (1,
-                        (int)e.x_root, (int)e.y_root, e.time);
-
-                    video_player.lock_hide ();
-
-                    return true;
-                }
-                return false;
-            });
-            clutter.button_release_event.connect ( (e) => {
-                down = false;
-                return false;
-            });
-            mainwindow.focus_in_event.connect (() => {
-                if (moving) {
-                    video_player.unlock_hide ();
-                    moving = false;
-                }
-                return false;
-            });
-
-            /*DnD*/
+                geom.min_aspect = geom.max_aspect = video_w / (double)video_h;
+                mainwindow.get_window ().set_geometry_hints (geom, Gdk.WindowHints.ASPECT);
+            }
+        }
+
+        private void on_window_state_changed (Gdk.WindowState window_state) {
+            bool currently_maximized = (window_state & Gdk.WindowState.MAXIMIZED) == 0;
+
+            if (!currently_maximized && !fullscreened && !welcome.is_visible ()) {
+                mainwindow.fullscreen ();
+                fullscreened = true;
+            }
+        }
+
+        /*DnD*/
+        private void setup_drag_n_drop () {
             Gtk.TargetEntry uris = {"text/uri-list", 0, 0};
             Gtk.drag_dest_set (mainwindow, Gtk.DestDefaults.ALL, {uris}, Gdk.DragAction.MOVE);
             mainwindow.drag_data_received.connect ( (ctx, x, y, sel, info, time) => {
-                for (var i=1;i<sel.get_uris ().length; i++)
-                    playlist.add_item (File.new_for_uri (sel.get_uris ()[i]));
+                foreach (var uri in sel.get_uris ()) {
+                    playlist.add_item (File.new_for_uri (uri));
+                }
                 open_file (sel.get_uris ()[0]);
-
                 welcome.hide ();
                 clutter.show_all ();
             });
-
-            //save position in video when not finished playing
-            mainwindow.destroy.connect ( () => {
-                if (video_player.uri == null || video_player.uri == "" || video_player.uri.has_prefix ("dvd://"))
-                    return;
-                if (!video_player.at_end) {
-                    for (var i = 0; i < last_played_videos.length (); i += 2){
-                        if (video_player.uri == last_played_videos.nth_data (i)){
-                            last_played_videos.nth (i+1).data = video_player.progress.to_string ();
-                            save_last_played_videos ();
-
-                            return;
-                        }
-                    }
-                    //not in list yet, insert at start
-                    last_played_videos.insert (video_player.uri, 0);
-                    last_played_videos.insert (video_player.progress.to_string (), 1);
-                    if (last_played_videos.length () > 10) {
-                        last_played_videos.delete_link (last_played_videos.nth (10));
-                        last_played_videos.delete_link (last_played_videos.nth (11));
-                    }
-                    save_last_played_videos ();
-                }
-            });
-        }
-
-        public void next_audio () {
-            int n_audio;
-            video_player.playbin.get ("n-audio", out n_audio);
-            int current = video_player.current_audio;
-
-            if (n_audio > 1) {
-                if (current < n_audio - 1) {
-                    current += 1;
-                } else {
-                    current = 0;
-                }
-            }
-            tagview.languages.active_id = current.to_string ();
-        }
-
-        public void next_text () {
-            int n_text;
-            video_player.playbin.get ("n-text", out n_text);
-            int current = int.parse (tagview.subtitles.active_id);
-
-            if (n_text > 1) {
-                if (current < n_text - 1) {
-                    current  += 1;
-                } else {
-                    current = -1;
-                }
-            }
-            tagview.subtitles.active_id = current.to_string ();
+        }
+
+        private void on_destroy () {
+            if (video_player.uri == null || video_player.uri == "" || video_player.uri.has_prefix ("dvd://"))
+                return;
+            if (!video_player.at_end) {
+                save_last_played_videos ();
+            }
+        }
+
+        private int old_h = - 1;
+        private int old_w = - 1;
+        private void on_size_allocate (Gtk.Allocation alloc) {
+            if (alloc.width != old_w || alloc.height != old_h) {
+                if (video_player.relayout ()) {
+                    old_w = alloc.width;
+                    old_h = alloc.height;
+                }
+            }
+        }
+
+        private bool update_pointer_position (double y, int window_height) {
+            allocate_bottombar ();
+            mainwindow.get_window ().set_cursor (null);
+            if (bottom_bar_size == 0) {
+                int minimum = 0;
+                bottom_bar.get_preferred_height (out minimum, out bottom_bar_size);
+            }
+
+            if (bottom_bar.child_revealed == false)
+                bottom_bar.set_reveal_child (true);
+
+            if (y >= (window_height - bottom_bar_size) && y < window_height) {
+                bottom_bar.hovered = true;
+            } else {
+                bottom_bar.hovered = false;
+            }
+
+            return false;
         }
 
         private inline void save_last_played_videos () {
-            string res = "";
-            for (var i = 0; i < last_played_videos.length () - 1; i ++)
-                res += last_played_videos.nth_data (i) + ",";
+            playlist.save_playlist_config ();
 
-            res += last_played_videos.nth_data (last_played_videos.length () - 1);
-            settings.last_played_videos = res;
+            if (settings.last_played_videos.length > 0)
+                settings.last_stopped = video_player.progress;
+            else
+                settings.last_stopped = 0;
         }
 
-        private void run_open_file () {
+        public void run_open_file () {
             var file = new Gtk.FileChooserDialog (_("Open"), mainwindow, Gtk.FileChooserAction.OPEN,
-                Gtk.Stock.CANCEL, Gtk.ResponseType.CANCEL, Gtk.Stock.OPEN, Gtk.ResponseType.ACCEPT);
+                _("_Cancel"), Gtk.ResponseType.CANCEL, _("_Open"), Gtk.ResponseType.ACCEPT);
             file.select_multiple = true;
 
             var all_files_filter = new Gtk.FileFilter ();
@@ -582,92 +574,95 @@
             if (file.run () == Gtk.ResponseType.ACCEPT) {
                 welcome.hide ();
                 clutter.show_all ();
-                for (var i=1;i<file.get_files ().length ();i++) {
-                    playlist.add_item (file.get_files ().nth_data (i));
-                }
                 open_file (file.get_uri ());
                 settings.last_folder = file.get_current_folder ();
             }
+
             file.destroy ();
         }
 
-        private void run_open_dvd () {
-            open_file ("dvd://", true);
+        public void run_open_dvd () {
+            read_first_disk.begin ();
+        }
+
+        private async void read_first_disk () {
+            var disk_manager = DiskManager.get_default ();
+            if (disk_manager.get_volumes ().length () <= 0)
+                return;
+            var volume = disk_manager.get_volumes ().nth_data (0);
+            if (volume.can_mount () == true && volume.get_mount ().can_unmount () == false) {
+                try {
+                    yield volume.mount (MountMountFlags.NONE, null);
+                } catch (Error e) {
+                    critical (e.message);
+                }
+            }
+
+            var root = volume.get_mount ().get_default_location ();
+            open_file (root.get_uri (), true);
             video_player.playing = true;
 
             welcome.hide ();
             clutter.show_all ();
         }
 
-        private void toggle_fullscreen ()
-        {
-            if (video_player.fullscreened) {
+        private void toggle_fullscreen () {
+            if (fullscreened) {
                 mainwindow.unmaximize ();
                 mainwindow.unfullscreen ();
-                video_player.fullscreened = false;
+                fullscreened = false;
             } else {
                 mainwindow.fullscreen ();
-                video_player.fullscreened = true;
+                fullscreened = true;
             }
         }
 
-        internal void open_file (string filename, bool dont_modify=false)
-        {
+        internal void open_file (string filename, bool dont_modify = false) {
             var file = File.new_for_commandline_arg (filename);
 
             if (file.query_file_type (0) == FileType.DIRECTORY) {
                 Audience.recurse_over_dir (file, (file_ret) => {
                     playlist.add_item (file_ret);
                 });
+
                 file = playlist.get_first_item ();
             } else if (is_subtitle (filename) && video_player.playing) {
                 video_player.set_subtitle_uri (filename);
-                return;
+            } else if (video_player.playing == true) {
+                playlist.add_item (file);
+            } else {
+                playlist.add_item (file);
+                play_file (file.get_uri ());
             }
-            else
-                playlist.add_item (file);
+        }
 
-            play_file (file.get_uri ());
-        }
-        
         private bool is_subtitle (string uri) {
             if (uri.length < 4 || uri.get_char (uri.length-4) != '.')
                 return false;
+
             foreach (string ext in SUBTITLE_EXTENSIONS) {
                 if (uri.down ().has_suffix (ext))
                     return true;
             }
+
             return false;
         }
 
         public void play_file (string uri) {
             debug ("Opening %s", uri);
             video_player.uri = uri;
+            bottom_bar.set_preview_uri (uri);
 
             mainwindow.title = get_title (uri);
             if (!settings.playback_wait)
                 video_player.playing = true;
 
-            if (settings.resume_videos) {
-                int i;
-                for (i = 0; i < last_played_videos.length () && i != -1; i += 2) {
-                    if (video_player.uri == last_played_videos.nth_data (i))
-                        break;
-                    if (i == last_played_videos.length () - 1)
-                        i = -1;
-                }
-                if (i != -1 && last_played_videos.nth_data (i + 1) != null) {
-                    Idle.add (() => { video_player.progress = double.parse (last_played_videos.nth_data (i + 1)); return false;});
-                    debug ("Resuming video from " + last_played_videos.nth_data (i + 1));
-                }
-            }
-
             Gtk.RecentManager recent_manager = Gtk.RecentManager.get_default ();
             recent_manager.add_item (uri);
 
             /*subtitles/audio tracks*/
-            tagview.setup_setup ("text");
-            tagview.setup_setup ("audio");
+            bottom_bar.preferences_popover.setup_text ();
+            bottom_bar.preferences_popover.setup_audio ();
         }
 
         //the application started
@@ -676,16 +671,15 @@
         }
 
         //the application was requested to open some files
-        public override void open (File [] files, string hint) {
+        public override void open (File[] files, string hint) {
             if (mainwindow == null)
                 activate ();
 
-            for (var i = 1; i < files.length; i ++)
-                playlist.add_item (files[i]);
-
-            open_file (files[0].get_path ());
             welcome.hide ();
             clutter.show_all ();
+            foreach (var file in files) {
+                open_file (file.get_path ());
+            }
         }
     }
 }

=== added file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	1970-01-01 00:00:00 +0000
+++ src/CMakeLists.txt	2014-07-06 11:18:29 +0000
@@ -0,0 +1,57 @@
+# Vala stuff
+find_package (Vala REQUIRED)
+include (ValaVersion)
+ensure_vala_version ("0.22" MINIMUM)
+include (ValaPrecompile)
+
+# Configure file
+set (CONFIG_FILE ${CMAKE_CURRENT_BINARY_DIR}/config.vala)
+configure_file (${CMAKE_CURRENT_SOURCE_DIR}/Config.vala.cmake ${CONFIG_FILE})
+
+# pkgconfig, real C code
+find_package (PkgConfig)
+
+set (PKG_DEPS granite clutter-gtk-1.0 gstreamer-1.0 gstreamer-pbutils-1.0 gstreamer-tag-1.0)
+set (VALA_DEPS 
+    granite
+    clutter-gtk-1.0
+    gdk-x11-3.0
+    gstreamer-1.0
+    gstreamer-pbutils-1.0
+    gstreamer-tag-1.0
+)
+
+pkg_check_modules (DEPS REQUIRED ${PKG_DEPS})
+set (CFLAGS ${DEPS_CFLAGS} ${DEPS_CFLAGS_OTHER})
+link_directories (${DEPS_LIBRARY_DIRS})
+add_definitions (${CFLAGS})
+
+set (EXEC_NAME ${CMAKE_PROJECT_NAME})
+
+vala_precompile (VALA_C ${EXEC_NAME}
+    ${CONFIG_FILE}
+    Audience.vala
+    Consts.vala
+    Settings.vala
+    Utils.vala
+    DiskManager.vala
+    Widgets/BottomBar.vala
+    Widgets/SettingsPopover.vala
+    Widgets/PreviewPopover.vala
+    Widgets/TimeWidget.vala
+    Widgets/Playlist.vala
+    Widgets/PlaylistPopover.vala
+    Widgets/VideoPlayer.vala
+    desktop-launcher.vala
+  PACKAGES
+    ${VALA_DEPS}
+  OPTIONS
+    --enable-experimental
+    --target-glib=2.32 # Remember to keep this updated.
+    --thread
+    -g
+)
+
+add_executable (${EXEC_NAME} ${VALA_C})
+target_link_libraries (${EXEC_NAME} ${DEPS_LIBRARIES})
+install (TARGETS ${EXEC_NAME} RUNTIME DESTINATION bin)
\ No newline at end of file

=== modified file 'src/Consts.vala'
--- src/Consts.vala	2013-03-31 21:46:37 +0000
+++ src/Consts.vala	2014-07-06 11:18:29 +0000
@@ -1,6 +1,7 @@
 
 namespace Audience {
-    
     public const int CONTROLS_HEIGHT = 32;
+    // 204/255 = 80% opacity
+    public const uint GLOBAL_OPACITY = 204;
 
-}
+}
\ No newline at end of file

=== added file 'src/DiskManager.vala'
--- src/DiskManager.vala	1970-01-01 00:00:00 +0000
+++ src/DiskManager.vala	2014-07-06 11:18:29 +0000
@@ -0,0 +1,98 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Corentin Noël <[e-mail]>
+ */
+
+public class Audience.DiskManager : GLib.Object {
+    public signal void volume_found (Volume volume);
+    public signal void volume_removed (Volume volume);
+
+    private static DiskManager disk_manager = null;
+    public static DiskManager get_default () {
+        if (disk_manager == null) {
+            disk_manager = new DiskManager ();
+        }
+
+        return disk_manager;
+    }
+
+    private GLib.VolumeMonitor monitor;
+    private List<Volume> volumes;
+
+    private DiskManager () {
+        monitor = GLib.VolumeMonitor.get ();
+        volumes = monitor.get_volumes ();
+
+        monitor.drive_changed.connect ((drive) => {
+            debug ("Drive changed: %s\n", drive.get_name ());
+        });
+
+        monitor.drive_connected.connect ((drive) => {
+            debug ("Drive connected: %s", drive.get_name ());
+        });
+
+        monitor.drive_disconnected.connect ((drive) => {
+            debug ("Drive disconnected: %s", drive.get_name ());
+        });
+
+        monitor.drive_eject_button.connect ((drive) => {
+            debug ("Drive eject-button: %s", drive.get_name ());
+        });
+
+        monitor.drive_stop_button.connect ((drive) => {
+            debug ("Drive stop-button:%s", drive.get_name ());
+        });
+
+        monitor.volume_added.connect ((volume) => {
+            check_for_volume (volume);
+            debug ("Volume added: %s", volume.get_name ());
+        });
+
+        monitor.volume_changed.connect ((volume) => {
+            check_for_volume (volume);
+            debug ("Volume changed: %s", volume.get_name ());
+        });
+
+        monitor.volume_removed.connect ((volume) => {
+            volumes.remove (volume);
+            volume_removed (volume);
+            debug ("Volume removed: %s", volume.get_name ());
+        });
+    }
+
+    public GLib.List<Volume> get_volumes () {
+        return volumes.copy ();
+    }
+
+    private void check_for_volume (Volume volume) {
+        if (volume.get_drive ().is_media_check_automatic () == true) {
+            if (volume.get_drive ().has_media () == true) {
+                var root = volume.get_activation_root ();
+                if (root != null) {
+                    var video = root.get_child ("VIDEO_TS");
+                    var bdmv = root.get_child ("BDMV");
+                    var audio = root.get_child ("AUDIO_TS");
+                    if (audio.query_exists () == true || video.query_exists () == true || bdmv.query_exists () == true) {
+                        volumes.append (volume);
+                        volume_found (volume);
+                    }
+                }
+            }
+        }
+    }
+}
\ No newline at end of file

=== modified file 'src/Settings.vala'
--- src/Settings.vala	2013-03-31 21:46:37 +0000
+++ src/Settings.vala	2014-07-06 11:18:29 +0000
@@ -1,19 +1,36 @@
-
-namespace Audience {
-
-    public class Settings : Granite.Services.Settings {
-        public bool move_window          {get; set;}
-        public bool keep_aspect          {get; set;}
-        public bool resume_videos        {get; set;}
-        public string last_played_videos {get; set;} /*video1,time,video2,time2,...*/
-        public string last_folder        {get; set;}
-        public bool playback_wait        {get; set;}
-        public bool stay_on_top          {get; set;}
-        public bool show_window_decoration {get; set;}
-
-        public Settings () {
-            base ("org.pantheon.Audience");
-        }
-
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Tom Beckmann <[e-mail]>
+ */
+
+public class Audience.Settings : Granite.Services.Settings {
+    public bool move_window {get; set;}
+    public bool keep_aspect {get; set;}
+    public bool resume_videos {get; set;}
+    public string[] last_played_videos {get; set;}
+    public double last_stopped {get; set;}
+    public string last_folder {get; set;}
+    public bool playback_wait {get; set;}
+    public bool stay_on_top {get; set;}
+    public bool show_window_decoration {get; set;}
+
+    public Settings () {
+        base ("org.pantheon.Audience");
     }
-}
+
+}
\ No newline at end of file

=== modified file 'src/Utils.vala'
--- src/Utils.vala	2014-04-28 12:58:09 +0000
+++ src/Utils.vala	2014-07-06 11:18:29 +0000
@@ -1,3 +1,22 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Tom Beckmann <[e-mail]>
+ */
 
 [DBus (name = "org.gnome.SettingsDaemon.MediaKeys")]
 public interface GnomeMediaKeys : GLib.Object {
@@ -8,7 +27,7 @@
 
 [DBus (name = "org.gnome.SessionManager")]
 public interface GnomeSessionManager : GLib.Object {
-	public abstract bool isSessionRunning() throws GLib.IOError;
+    public abstract bool isSessionRunning() throws GLib.IOError;
     public abstract uint32 Inhibit (string app_id, uint32 toplevel_xid, string reason, uint32 flags) throws GLib.IOError;
     public abstract void Uninhibit (uint32 inhibit_cookie) throws GLib.IOError;
 }
@@ -18,16 +37,16 @@
     public static void recurse_over_dir (File file_to_process, FuncOverDir func) {
         if (file_to_process.query_file_type (0) == FileType.DIRECTORY) {
             try {
-                var files = file_to_process.enumerate_children (FileAttribute.STANDARD_NAME, 0);
+                var files = file_to_process.enumerate_children (FileAttribute.STANDARD_NAME + "," + FileAttribute.ACCESS_CAN_READ, FileQueryInfoFlags.NONE);
                 FileInfo info;
                 while ((info = files.next_file ()) != null) {
-                    var file = GLib.File.new_for_uri (
-                        file_to_process.get_uri ()  +"/"+info.get_name ());
-                    recurse_over_dir (file,func);
+                    var file = GLib.File.new_for_uri (file_to_process.get_uri () + "/" + info.get_name ());
+                    recurse_over_dir (file, func);
                 }
-            } catch (Error e) { warning (e.message); }
-        }
-        else {
+            } catch (Error e) {
+                critical (e.message);
+            }
+        } else {
             func (file_to_process);
         }
     }
@@ -40,216 +59,51 @@
     }
 
     public static string get_extension (string filename) {
-        int i=0;
-        for (i=filename.length;i!=0;i--) {
-            if (filename [i] == '.')
-                break;       
+        for (uint i=filename.length; i!=0; i--) {
+            if (filename[i] == '.')
+                return filename.substring (i+1);
         }
-        return filename.substring (i+1);
+
+        return filename;
     }
 
     public static string get_basename (string filename) {
-        int start = 0, end = 0;
-        for (start=filename.length; start != 0; start--) {
+        uint end = 0;
+        for (uint start=filename.length; start != 0; start--) {
             if (filename[start] == '/') {
                 start ++;
-                break;
+                return filename.substring (start, end - start);
             }
+
             if (filename[start] == '.' && end == 0)
                 end = start;
         }
-        return filename.substring (start, end - start);
+
+        return filename.substring (0, end);
     }
 
     public static string seconds_to_time (int seconds) {
         int hours = seconds / 3600;
-        int minutes = (seconds % 3600) / 60;
-        seconds = seconds % 60;
-
-        string time = (hours > 0) ? hours.to_string() + ":" : "";
-        time += (((hours > 0) && (minutes < 10)) ? "0" : "") + minutes.to_string() + ":";
-        time += ((seconds < 10) ? "0" : "") + seconds.to_string();
-        return time;
+        string min = normalize_time ((seconds % 3600) / 60);
+        string sec = normalize_time (seconds % 60);
+
+        if (hours > 0) {
+            return ("%d:%s:%s".printf (hours, min, sec));
+        } else {
+            return ("%s:%s".printf (min, sec));
+        }
+    }
+
+    public static string normalize_time (int time) {
+        if (time < 10) {
+            return "0%d".printf (time);
+        } else {
+            return "%d".printf (time);
+        }
     }
 
     public static bool has_dvd () {
-        var volume_monitor = GLib.VolumeMonitor.get ();
-        var volumes = volume_monitor.get_connected_drives ();
-
-        for (var i=0; i < volumes.length ();i++) {
-            if (volumes.nth_data (i).get_name ().index_of ("DVD") != -1 &&
-                volumes.nth_data (i).has_media ())
-                return true;
-        }
-
-        return false;
-    }
-
-	public static dynamic Gst.Element get_clutter_sink ()
-	{
-		var sink = Gst.ElementFactory.make ("autocluttersink", "videosink");
-		if (sink == null) {
-			warning ("autocluttersink not available");
-			sink = Gst.ElementFactory.make ("cluttersink", "videosink");
-		}
-
-		return sink;
-	}
-
-    /*
-     * get a thumbnail from a file
-     * @param file the file
-     * @param position the position in the video or -1 for 5%
-     * @param pixbuf gtkclutter texture to put the pixbuf in once it's ready
-     * TODO appears not to load thumbs for bigger files
-     **/
-    /* NOT NEEDED CURRENTLY
-	public static void get_thumb (File file, int64 position, GtkClutter.Texture tex) {
-        //pipeline
-        bool got_video = false;
-        var pipe = new Gst.Pipeline ("pipeline");
-        var src  = Gst.ElementFactory.make ("filesrc", "file");
-        dynamic Gst.Element dec  = Gst.ElementFactory.make ("decodebin2", "dec");
-
-        pipe.add_many (src, dec);
-        src.link (dec);
-        src.set ("location", file.get_path ());
-        dynamic Gst.Element sink = null;
-        dec.pad_added.connect ( (new_pad) => {
-            if (got_video)
-                return;
-
-            var csp    = Gst.ElementFactory.make ("ffmpegcolorspace", "f");
-            var scale  = Gst.ElementFactory.make ("videoscale", "s");
-            var filter = Gst.ElementFactory.make ("capsfilter", "c");
-                sink   = Gst.ElementFactory.make ("gdkpixbufsink", "sink");
-
-            pipe.add_many (csp, scale, filter, sink);
-
-            var sinkpad = csp.get_static_pad ("sink");
-            new_pad.link (sinkpad);
-
-            csp.link (scale);
-            scale.link (filter);
-            filter.link (sink);
-
-            sink.set_state (Gst.State.PAUSED);
-            filter.set_state (Gst.State.PAUSED);
-            scale.set_state (Gst.State.PAUSED);
-            csp.set_state (Gst.State.PAUSED);
-
-            got_video = true;
-        });
-
-        pipe.get_bus ().add_signal_watch ();
-
-        pipe.set_state (Gst.State.PAUSED);
-
-        bool ready = false;
-        pipe.get_bus ().message.connect ( (bus, msg) => {
-            switch (msg.type) {
-                case Gst.MessageType.ASYNC_DONE:
-                    if (msg.src != pipe)
-                        break;
-                    var fmt = Gst.Format.TIME;
-                    int64 pos;
-                    pipe.query_position (fmt, out pos);
-                    if (pos > 1)
-                        ready = true;
-                    else
-                        break;
-                    if (position == -1) {
-                        int64 dur;
-                        pipe.query_duration (fmt, out dur);
-                        pipe.seek_simple (Gst.Format.TIME, Gst.SeekFlags.ACCURATE |
-                            Gst.SeekFlags.FLUSH, (int64)(dur*0.5));
-                    }else {
-                        pipe.seek_simple (Gst.Format.TIME, Gst.SeekFlags.ACCURATE |
-                            Gst.SeekFlags.FLUSH, position);
-                    }
-                    break;
-                case Gst.MessageType.ELEMENT:
-                    if (!ready)
-                        break;
-                    if (msg.src != sink)
-                        break;
-                    if (!msg.get_structure ().has_name ("prerollpixbuf") &&
-                        !msg.get_structure ().has_name ("pixbuf"))
-                        break;
-                    var val = msg.get_structure ().get_value ("pixbuf");
-                    var pixbuf = (Gdk.Pixbuf)val.dup_object ();
-                    if (pixbuf == null)
-                        return;
-                    try {
-                        tex.set_from_pixbuf (pixbuf);
-                    } catch (Error e) {warning (e.message);}
-                    pipe.set_state (Gst.State.NULL);
-                    break;
-                default:
-                    break;
-            }
-        });
-
-        pipe.set_state (Gst.State.PLAYING);
-    }*/
-
-    namespace Drawing {
-
-        /**
-         * Draws a popover shape
-         */
-        public static void cairo_popover (Cairo.Context cr, double x, double y, double width, double height,
-                                          double radius, double arrow_height, double arrow_width)
-        {
-            double edge_width = (width - radius * 2);
-            double arrow_offset = (edge_width - arrow_width) / 2;
-
-
-            cr.arc (x + width - radius, y + radius, radius, Math.PI * 1.5, Math.PI * 2);
-            cr.arc (x + width - radius, y + height - radius, radius, 0, Math.PI * 0.5);
-
-            cr.arc (x + radius, y + height - radius, radius, Math.PI * 0.5, Math.PI);
-            cr.arc (x + radius, y + radius, radius, Math.PI, Math.PI * 1.5);
-            cr.move_to (x + radius + arrow_offset, y + height);
-
-            cr.rel_line_to (arrow_width / 2, arrow_height);
-            cr.rel_line_to (arrow_width / 2, -arrow_height);
-
-            cr.close_path ();
-        }
-
-        /**
-         * Draws a 'pill' shape (rounded rectangle with boder radius such that both ends are semicircles)
-         */
-        public static void cairo_pill (Cairo.Context cr, double x, double y, double width, double height) {
-            Granite.Drawing.Utilities.cairo_rounded_rectangle (cr, x, y, width, height, height / 2);
-        }
-
-        /**
-         * Draws a ' halfpill' shape (rounded rectangle with boder radius such that one ends is a semicircle)
-         */
-        public static void cairo_half_pill (Cairo.Context cr, double x, double y, double width, double height, Gtk.PositionType side) {
-            double radius = height / 2;
-            cr.move_to (x + radius, y);
-            switch (side) {
-                case Gtk.PositionType.LEFT:
-                    cr.arc (x + width - radius, y + radius, radius, Math.PI * 1.5, Math.PI * 0.5);
-                    cr.line_to ((int)x, y + height); // (int) required to not draw 'half' pixels (blurry)
-                    cr.line_to ((int)x, y);
-                    cr.line_to ((int)(x + width - radius), y);
-                    break;
-                case Gtk.PositionType.RIGHT:
-                    cr.arc (x + radius, y + height - radius, radius, Math.PI * 0.5, Math.PI * 1.5);
-                    cr.line_to ((int)(x + width), y);
-                    cr.line_to ((int)(x + width), y + height);
-                    cr.line_to ((int)(x + radius), y + height);
-                    break;
-                default:
-                    assert_not_reached();
-            }
-            cr.close_path ();
-        }
-
-
+        var disk_manager = DiskManager.get_default ();
+        return disk_manager.get_volumes ().length () > 0;
     }
 }
\ No newline at end of file

=== added file 'src/Widgets/BottomBar.vala'
--- src/Widgets/BottomBar.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/BottomBar.vala	2014-07-06 11:18:29 +0000
@@ -0,0 +1,160 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Corentin Noël <[e-mail]>
+ */
+
+public class Audience.Widgets.BottomBar : Gtk.Revealer {
+    public signal void play_toggled ();
+    public signal void unfullscreen ();
+    public signal void seeked (double val);
+
+    public bool hovered { get; set; default=false; }
+    public bool fullscreen { get; set; default=false; }
+    public SettingsPopover preferences_popover;
+    public TimeWidget time_widget;
+
+    private Gtk.Button play_button;
+    private Gtk.Button preferences_button;
+    private Gtk.Revealer unfullscreen_revealer;
+    private PlaylistPopover playlist_popover;
+    private bool is_playing = false;
+    private uint hiding_timer = 0;
+
+    public BottomBar () {
+        transition_type = Gtk.RevealerTransitionType.CROSSFADE;
+        var main_actionbar = new Gtk.ActionBar ();
+        main_actionbar.opacity = GLOBAL_OPACITY;
+
+        play_button = new Gtk.Button.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.BUTTON);
+        play_button.tooltip_text = _("Play");
+        play_button.clicked.connect (() => {play_toggled ();});
+
+        var playlist_button = new Gtk.Button.from_icon_name ("view-list-symbolic", Gtk.IconSize.BUTTON);
+        playlist_button.tooltip_text = _("Playlist");
+        playlist_button.clicked.connect (() => {playlist_popover.show_all (); playlist_popover.queue_resize ();});
+
+        preferences_button = new Gtk.Button.from_icon_name ("document-properties-symbolic", Gtk.IconSize.BUTTON);
+        preferences_button.tooltip_text = _("Settings");
+        preferences_button.clicked.connect (() => {preferences_popover.show_all (); preferences_popover.queue_resize ();});
+
+        time_widget = new TimeWidget ();
+        time_widget.seeked.connect ((val) => {seeked (val);});
+
+        playlist_popover = new PlaylistPopover ();
+        playlist_popover.relative_to = playlist_button;
+        preferences_popover = new SettingsPopover ();
+        preferences_popover.relative_to = preferences_button;
+
+        main_actionbar.pack_start (play_button);
+        main_actionbar.set_center_widget (time_widget);
+        main_actionbar.pack_end (preferences_button);
+        main_actionbar.pack_end (playlist_button);
+        add (main_actionbar);
+
+        notify["hovered"].connect (() => {
+            if (hovered == false) {
+                set_timeout ();
+            } else {
+                if (hiding_timer != 0) {
+                    Source.remove (hiding_timer);
+                    hiding_timer = 0;
+                }
+            }
+        });
+
+        notify["fullscreen"].connect (() => {
+            if (fullscreen == true && child_revealed == true) {
+                unfullscreen_revealer.set_reveal_child (true);
+            } else if (fullscreen == false && child_revealed == true) {
+                unfullscreen_revealer.set_reveal_child (false);
+            }
+        });
+
+        show_all ();
+    }
+
+    public void set_preview_uri (string uri) {
+        time_widget.set_preview_uri (uri);
+    }
+
+    public Gtk.Revealer get_unfullscreen_button () {
+        unfullscreen_revealer = new Gtk.Revealer ();
+        unfullscreen_revealer.opacity = GLOBAL_OPACITY;
+        unfullscreen_revealer.get_style_context ().add_class ("header-bar");
+        unfullscreen_revealer.transition_type = Gtk.RevealerTransitionType.CROSSFADE;
+        var unfullscreen_button = new Gtk.Button.from_icon_name ("view-restore-symbolic", Gtk.IconSize.BUTTON);
+        unfullscreen_button.tooltip_text = _("Unfullscreen");
+        unfullscreen_button.clicked.connect (() => {unfullscreen ();});
+        unfullscreen_revealer.add (unfullscreen_button);
+        unfullscreen_revealer.show_all ();
+        return unfullscreen_revealer;
+    }
+
+    public void toggle_play_pause () {
+        is_playing = !is_playing;
+        if (is_playing == true) {
+            play_button.image = new Gtk.Image.from_icon_name ("media-playback-pause-symbolic", Gtk.IconSize.BUTTON);
+            play_button.tooltip_text = _("Pause");
+            set_timeout ();
+        } else {
+            play_button.image = new Gtk.Image.from_icon_name ("media-playback-start-symbolic", Gtk.IconSize.BUTTON);
+            play_button.tooltip_text = _("Play");
+            set_reveal_child (true);
+        }
+    }
+
+    public new void set_reveal_child (bool reveal) {
+        base.set_reveal_child (reveal);
+        if (reveal == true && fullscreen == true) {
+            unfullscreen_revealer.set_reveal_child (reveal);
+        } else if (reveal == false) {
+            unfullscreen_revealer.set_reveal_child (reveal);
+        }
+    }
+
+    public override void get_preferred_width (out int minimum_width, out int natural_width) {
+        base.get_preferred_width (out minimum_width, out natural_width);
+        if (parent.get_window () == null)
+            return;
+
+        var width = parent.get_window ().get_width ();
+        if (width > 0 && width >= minimum_width) {
+            natural_width = width;
+        }
+    }
+
+    public void set_progression_time (double current_time, double total_time) {
+        time_widget.set_progression_time (current_time, total_time);
+    }
+
+    private void set_timeout () {
+        if (hiding_timer != 0)
+            Source.remove (hiding_timer);
+
+        hiding_timer = GLib.Timeout.add (2000, () => {
+            if (hovered == true || preferences_popover.visible == true || playlist_popover.visible == true || is_playing == false) {
+                hiding_timer = 0;
+                return false;
+            }
+            set_reveal_child (false);
+            unfullscreen_revealer.set_reveal_child (false);
+            hiding_timer = 0;
+            return false;
+        });
+    }
+}
\ No newline at end of file

=== removed file 'src/Widgets/Button.vala'
--- src/Widgets/Button.vala	2013-05-19 17:10:26 +0000
+++ src/Widgets/Button.vala	1970-01-01 00:00:00 +0000
@@ -1,53 +0,0 @@
-
-namespace Audience.Widgets{
-
-    public class Button : GtkClutter.Texture {
-        public signal void clicked ();
-
-        bool pressed = false;
-
-        public Button (string icon, string fallback, string alt_fallback=""){
-            set_icon (icon, fallback, alt_fallback);
-
-            reactive = true;
-            width = 16;
-            height = 16;
-            opacity = 255;
-        }
-
-        public override bool leave_event (Clutter.CrossingEvent event) {
-            animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200, opacity:255);
-            return true;
-        }
-
-        public override bool enter_event (Clutter.CrossingEvent event) {
-            animate (Clutter.AnimationMode.EASE_OUT_QUAD, 200, opacity:170);
-            return true;
-        }
-
-        public override bool button_press_event (Clutter.ButtonEvent event) {
-            pressed = true;
-            return true;
-        }
-
-        public override bool button_release_event (Clutter.ButtonEvent event) {
-            if (pressed) {
-                clicked ();
-                pressed = false;
-            }
-            return true;
-        }
-
-        public void set_icon (string icon, string fallback, string alt_fallback="") {
-            try {
-                var ti = new ThemedIcon.from_names ({icon, alt_fallback, fallback});
-                var l = Gtk.IconTheme.get_default ().lookup_by_gicon (ti, 16, 0);
-                if (l != null) {
-                    this.set_from_pixbuf (l.load_symbolic ({1.0,1.0,1.0,1.0}, null, null, null, null));
-                } else {
-                    warning("NULL detected when trying to load icon: " + icon + " (or " + fallback + ")");
-                }
-            } catch (Error e){warning (e.message);}
-        }
-    }
-}

=== removed file 'src/Widgets/ControlsBar.vala'
--- src/Widgets/ControlsBar.vala	2013-05-19 17:10:26 +0000
+++ src/Widgets/ControlsBar.vala	1970-01-01 00:00:00 +0000
@@ -1,137 +0,0 @@
-using Clutter;
-
-namespace Audience.Widgets
-{
-    public class Controls : Actor
-    {
-        public MediaSlider slider;
-        public Button play;
-        public Button view;
-        public Button open;
-
-        public Text current;
-        public Text remaining;
-
-        private Gdk.Pixbuf play_pix;
-        private Gdk.Pixbuf pause_pix;
-
-        public bool showing_view = false;
-        public bool hovered { get; set; }
-
-        public Controls ()
-        {
-            layout_manager = new BoxLayout ();
-            content = new Canvas ();
-
-            (layout_manager as BoxLayout).spacing = 10;
-
-            this.current   = new Text.full ("", "0", {255,255,255,255});
-            this.remaining = new Text.full ("", "0", {255,255,255,255});
-
-            this.slider = new MediaSlider ();
-
-            this.play = new Button ("media-playback-start-symbolic", Gtk.Stock.MEDIA_PLAY);
-
-            this.view = new Button ("pane-show-symbolic", Gtk.Stock.GO_BACK, "go-previous-symbolic");
-
-            this.open = new Button ("list-add-symbolic", Gtk.Stock.OPEN);
-
-            var spacer_left = new Rectangle.with_color ({0,0,0,0});
-            spacer_left.width = 0;
-            var spacer_right = new Rectangle.with_color ({0,0,0,0});
-            spacer_right.width = 0;
-
-            this.add_child (spacer_left);
-            this.add_child (this.play);
-            this.add_child (this.current);
-            this.add_child (this.slider);
-            this.add_child (this.remaining);
-            this.add_child (this.open);
-            this.add_child (this.view);
-            this.add_child (spacer_right);
-
-            (layout_manager as BoxLayout).set_expand (slider, true);
-            (layout_manager as BoxLayout).set_fill (slider, true, true);
-
-            /*setup a css style for the control background*/
-            var style_holder = new Gtk.EventBox ();
-            var css = new Gtk.CssProvider ();
-            try{css.load_from_data ("""
-            * {
-                engine: unico;
-                background-image: -gtk-gradient (linear,
-                    left top, left bottom,
-                    from (alpha(#323232, 0.698)),
-                    to   (alpha(#242424, 0.698)));
-
-                -unico-outer-stroke-gradient: -gtk-gradient (linear,
-                    left top, left bottom,
-                    from (alpha(#161616, 0.698)),
-                    to   (alpha(#000000, 0.698)));
-                -unico-inner-stroke-gradient: -gtk-gradient (linear,
-                    left top, left bottom,
-                    from       (alpha(#ffffff, 0.149)),
-                    color-stop (0.1, alpha(#ffffff, 0.035)),
-                    color-stop (0.9, alpha(#ffffff, 0.024)),
-                    to         (alpha(#ffffff, 0.059)));
-                -unico-inner-stroke-width: 1;
-                -unico-outer-stroke-width: 1;
-            }
-            """, -1);}catch (Error e){warning (e.message);}
-            style_holder.get_style_context ().add_provider (css, Gtk.STYLE_PROVIDER_PRIORITY_APPLICATION);
-
-            (content as Canvas).draw.connect ( (ctx) => {
-                ctx.set_operator (Cairo.Operator.CLEAR);
-                ctx.paint ();
-                ctx.set_operator (Cairo.Operator.OVER);
-
-                style_holder.get_style_context ().render_background (ctx, -2, 0, width+4, CONTROLS_HEIGHT+1);
-                style_holder.get_style_context ().render_frame (ctx, -2, 0, width+4, CONTROLS_HEIGHT+1);
-
-                return false;
-            });
-            (content as Canvas).set_size (500, CONTROLS_HEIGHT);
-
-            try {
-                var l = Gtk.IconTheme.get_default ().lookup_icon ("media-playback-pause-symbolic", 16, 0);
-                if (l == null)
-                    this.pause_pix = new Gtk.Image.from_stock (Gtk.Stock.MEDIA_PAUSE, Gtk.IconSize.LARGE_TOOLBAR).pixbuf;
-                else
-                    this.pause_pix = l.load_symbolic ({1.0,1.0,1.0,1.0}, null, null, null, null);
-            } catch (Error e) { warning (e.message); }
-
-            try {
-                var l = Gtk.IconTheme.get_default ().lookup_icon ("media-playback-start-symbolic", 16, 0);
-                if (l == null)
-                    this.play_pix = new Gtk.Image.from_stock (Gtk.Stock.MEDIA_PLAY, Gtk.IconSize.LARGE_TOOLBAR).pixbuf;
-                else
-                    this.play_pix = l.load_symbolic ({1.0,1.0,1.0,1.0}, null, null, null, null);
-            } catch (Error e) { warning (e.message); }
-
-            this.height = CONTROLS_HEIGHT;
-
-            this.reactive = true;
-            this.enter_event.connect ( () => {
-                this.hovered = true;
-                return false;
-            });
-            this.leave_event.connect ( (e) => {
-                if (!contains (e.related))
-                    this.hovered = false;
-                return false;
-            });
-        }
-
-        // catch all button presses
-        public override bool button_press_event (Clutter.ButtonEvent event) {
-            return true;
-        }
-
-        public void show_play_button (bool show){ /*or show pause button*/
-            try{
-                this.play.set_from_pixbuf ((show)?play_pix:pause_pix);
-            }catch (Error e){warning (e.message);}
-        }
-    }
-
-}

=== removed file 'src/Widgets/LLabel.vala'
--- src/Widgets/LLabel.vala	2012-08-21 14:56:49 +0000
+++ src/Widgets/LLabel.vala	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-
-namespace Audience.Widgets{
-
-    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;
-        }
-    }
-}

=== removed file 'src/Widgets/MediaSlider.vala'
--- src/Widgets/MediaSlider.vala	2014-04-28 12:58:09 +0000
+++ src/Widgets/MediaSlider.vala	1970-01-01 00:00:00 +0000
@@ -1,238 +0,0 @@
-
-namespace Audience.Widgets{
-
-    public class MediaSlider : Clutter.Group {
-
-        public signal void seeked (double new_progress);
-
-        public Clutter.Texture preview;
-        public Clutter.Actor preview_bg;
-        dynamic Gst.Element preview_playbin;
-        dynamic Gst.Element sink;
-
-        double progress_stacked = 0.0;
-        bool seeking = false;
-
-        private double _buffered;
-        public double buffered{
-            get { return _buffered; }
-            set { _buffered = value; this.bar.invalidate (); }
-        }
-
-        private double _progress;
-        public double progress{
-            get { return _progress; }
-            set { _progress = value; this.bar.invalidate (); }
-        }
-
-        private Clutter.CairoTexture bar;
-
-        private const int BAR_HEIGHT = 8;
-
-        /*the mouse is currently on the controls*/
-        public bool mouse_grabbed = false;
-
-        public MediaSlider () {
-            this.preview   = new Clutter.Texture ();
-            this._buffered = 0.0;
-            this._progress = 0.0;
-            this.bar       = new Clutter.CairoTexture (1, BAR_HEIGHT);
-
-            preview.filter_quality = Clutter.TextureQuality.HIGH;
-            preview.scale_x = 0.0;
-            preview.scale_y = 0.0;
-            preview.scale_gravity = Clutter.Gravity.CENTER;
-            preview.height =  90.0f;
-            // preview.width is set in VideoPlayer.vala
-
-            // connect gstreamer stuff
-            preview_playbin = Gst.ElementFactory.make ("playbin", "play");
-            preview_playbin.get_bus ().add_signal_watch ();
-            preview_playbin.get_bus ().message.connect ((msg) => {
-                switch (msg.type) {
-                    case Gst.MessageType.STATE_CHANGED:
-                        if (progress_stacked != 0)
-                            seek (progress_stacked);
-                        break;
-                    case Gst.MessageType.ASYNC_DONE:
-                        if (seeking) {
-                            seeking = false;
-                            if (progress_stacked != 0)
-                                seek (progress_stacked);
-                        }
-                        break;
-                }
-            });
-            sink = Audience.get_clutter_sink ();
-            sink.texture = preview;
-            preview_playbin.video_sink = sink;
-
-            preview_bg = new Clutter.Actor ();
-            preview_bg.y = -120.0f;
-            preview_bg.add_constraint (new Clutter.BindConstraint (preview, Clutter.BindCoordinate.WIDTH, 30.0f));
-            preview_bg.add_constraint (new Clutter.BindConstraint (preview, Clutter.BindCoordinate.HEIGHT, 45.0f));
-            preview_bg.opacity = 0;
-            preview_bg.content = new Clutter.Canvas ();
-            preview_bg.allocation_changed.connect (() => {
-                (preview_bg.content as Clutter.Canvas).set_size ((int)preview_bg.width, (int)preview_bg.height);
-            });
-            var ARROW_HEIGHT = 17;
-            var ARROW_WIDTH  = 20;
-            var popover_grad = new Cairo.Pattern.linear (0, 0, 0, preview_bg.height);
-            popover_grad.add_color_stop_rgba (0.0, 0.243, 0.243, 0.243, 0.7);
-            popover_grad.add_color_stop_rgba (1.0, 0.094, 0.094, 0.094, 0.7);
-
-            var popover_inset_grad = new Cairo.Pattern.linear (0, 0, 0, preview_bg.height);
-            popover_inset_grad.add_color_stop_rgba (0.0, 1, 1, 1, 0.3);
-            popover_inset_grad.add_color_stop_rgba (1.0, 1, 1, 1, 0.1);
-            (preview_bg.content as Clutter.Canvas).draw.connect ( (ctx) => {
-                ctx.set_operator (Cairo.Operator.CLEAR);
-                ctx.paint ();
-                ctx.set_operator (Cairo.Operator.OVER);
-
-                // Outline
-                Drawing.cairo_popover (ctx, 0, 0, preview_bg.width,
-                    preview_bg.height - ARROW_HEIGHT, 3, ARROW_WIDTH, ARROW_HEIGHT);
-                ctx.set_source_rgba (0, 0, 0, 0.7);
-                ctx.fill ();
-
-                // Inset border
-                Drawing.cairo_popover (ctx, 1, 1, preview_bg.width - 2,
-                    preview_bg.height - 2 - ARROW_HEIGHT, 3, ARROW_WIDTH - 2, ARROW_HEIGHT - 2);
-                ctx.set_source (popover_inset_grad);
-                ctx.fill ();
-
-                ctx.set_operator(Cairo.Operator.SOURCE);
-                // Fill
-                Drawing.cairo_popover (ctx, 2, 2, preview_bg.width - 4,
-                    preview_bg.height - 4 - ARROW_HEIGHT, 3, ARROW_WIDTH - 4, ARROW_HEIGHT - 4);
-                ctx.set_source (popover_grad);
-                ctx.fill ();
-
-                ctx.set_operator(Cairo.Operator.OVER);
-                return true;
-            });
-
-            this.bar.y = CONTROLS_HEIGHT / 2 - BAR_HEIGHT / 2;
-            this.bar.auto_resize = true;
-            var bar_grad = new Cairo.Pattern.linear (0, 0, 0, BAR_HEIGHT);
-            bar_grad.add_color_stop_rgba (0.0, 0.254, 0.247, 0.231, 0.4);
-            bar_grad.add_color_stop_rgba (1.0, 0.298, 0.290, 0.282, 0.4);
-            var bar_shadow_grad = new Cairo.Pattern.linear (0, 0, 0, BAR_HEIGHT);
-            bar_shadow_grad.add_color_stop_rgba (0.0, 1, 1, 1, 0);
-            bar_shadow_grad.add_color_stop_rgba (1.0, 1, 1, 1, 0.2);
-            this.bar.draw.connect ( (ctx) => {
-                this.bar.clear();
-                //drop shadow
-                Drawing.cairo_pill (ctx, 0, 0, this.bar.width, BAR_HEIGHT);
-                ctx.set_source (bar_shadow_grad);
-                ctx.fill ();
-                //outline
-                Drawing.cairo_pill (ctx, 1, 1, this.bar.width - 2, BAR_HEIGHT - 2);
-                ctx.set_source_rgba (0, 0, 0, 0.4);
-                ctx.fill ();
-                //bg
-                Drawing.cairo_pill (ctx, 2, 2, this.bar.width - 4, BAR_HEIGHT - 4);
-                ctx.set_source (bar_grad);
-                ctx.fill ();
-                //buffering
-                if (this._buffered != 0.0){
-                    int64 duration;
-                    preview_playbin.query_duration (Gst.Format.TIME, out duration);
-                    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);
-                    ctx.fill ();
-                }
-                //progress
-                if (this._progress != 0.0){
-                    Drawing.cairo_half_pill (ctx, 2, 2, (this._progress * this.width) - 4, BAR_HEIGHT - 4, Gtk.PositionType.RIGHT);
-                    ctx.set_source_rgb (1.0, 1.0, 1.0);
-                    ctx.fill ();
-                }
-                return true;
-            });
-
-            var scalex = new Clutter.BindConstraint (this, Clutter.BindCoordinate.WIDTH, 0);
-            bar.add_constraint (scalex);
-
-            //seek
-            preview.reactive = true;
-
-            reactive = true;
-            add_child (bar);
-            add_child (preview_bg);
-        }
-
-        public override bool motion_event (Clutter.MotionEvent event)
-        {
-            float local_x, local_y;
-            this.transform_stage_point (event.x, event.y, out local_x, out local_y);
-
-            preview.x = event.x - preview.width / 2;
-            preview_bg.x = local_x - preview.width / 2 - 15.0f;
-
-            seek (float.max (local_x, 0.0000001f) / this.width);
-
-            return true;
-        }
-
-        public override bool enter_event (Clutter.CrossingEvent event)
-        {
-            this.preview.animate (Clutter.AnimationMode.EASE_OUT_ELASTIC, 800,
-                scale_x:1.0, scale_y:1.0);
-            preview_bg.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 500, opacity:240);
-            preview_toggle_playing (true);
-            this.mouse_grabbed = true;
-            return false;
-        }
-
-        public override bool leave_event (Clutter.CrossingEvent event)
-        {
-            preview.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 150,
-                scale_x:0.0, scale_y:0.0);
-            preview_bg.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 150, opacity:0);
-            preview_toggle_playing (false);
-            mouse_grabbed = false;
-            return false;
-        }
-
-        public override bool button_release_event (Clutter.ButtonEvent event)
-        {
-            float x, y;
-            this.transform_stage_point (event.x, event.y, out x, out y);
-            this.seeked (x / this.width);
-            return true;
-        }
-
-        public void set_preview_uri (string uri)
-        {
-            preview_playbin.set_state (Gst.State.READY);
-            preview_playbin.uri = uri;
-            preview_playbin.volume = 0.0;
-        }
-
-        void preview_toggle_playing (bool play)
-        {
-            this.preview_playbin.set_state (play ? Gst.State.PLAYING : Gst.State.PAUSED);
-        }
-
-        void seek (double progress)
-        {
-            if (seeking) {
-                progress_stacked = progress;
-                return;
-            }
-
-            int64 duration;
-            preview_playbin.query_duration (Gst.Format.TIME, out duration);
-            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);
-
-            this.progress_stacked = 0;
-
-            seeking = true;
-        }
-    }
-}

=== modified file 'src/Widgets/Playlist.vala'
--- src/Widgets/Playlist.vala	2012-08-21 14:56:49 +0000
+++ src/Widgets/Playlist.vala	2014-07-06 11:18:29 +0000
@@ -1,93 +1,98 @@
-
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Tom Beckmann <[e-mail]>
+ */
 
 namespace Audience.Widgets {
-
     public class Playlist : Gtk.TreeView {
-
-        /*the player is requested to play path*/
+        // the player is requested to play path
         public signal void play (File path);
 
-        private int                 current;
-        private Gtk.ListStore       playlist;
+        private enum Columns {
+            PLAYING,
+            TITLE,
+            FILENAME,
+            N_COLUMNS
+        }
+
+        private int current = 0;
+        private Gtk.ListStore playlist;
 
         public Playlist () {
-            this.current  = 0;
-            this.playlist = new Gtk.ListStore (4, typeof (Gdk.Pixbuf),  /*playing*/
-                                                  typeof (Gdk.Pixbuf),  /*icon*/
-                                                  typeof (string),      /*title*/
-                                                  typeof (string));     /*filename*/
+            this.playlist = new Gtk.ListStore (Columns.N_COLUMNS, typeof (Icon), typeof (string), typeof (string));
             this.model = this.playlist;
             this.expand = true;
             this.headers_visible = false;
+            this.activate_on_single_click = true;
+            this.can_focus = false;
+            get_selection ().mode = Gtk.SelectionMode.NONE;
 
             var text_render = new Gtk.CellRendererText ();
             text_render.ellipsize = Pango.EllipsizeMode.END;
 
-            this.insert_column_with_attributes (-1, "", new Gtk.CellRendererPixbuf (),
-                "pixbuf", 0);
-            this.insert_column_with_attributes (-1, "", new Gtk.CellRendererPixbuf (),
-                "pixbuf", 1);
-            this.insert_column_with_attributes (-1, "", text_render, "text", 2);
+            this.insert_column_with_attributes (-1, "Playing", new Gtk.CellRendererPixbuf (), "gicon", Columns.PLAYING);
+            this.insert_column_with_attributes (-1, "Title", text_render, "text", Columns.TITLE);
 
-            this.row_activated.connect ( (path ,col) => {
+            this.row_activated.connect ((path ,col) => {
                 Gtk.TreeIter iter;
                 playlist.get_iter (out iter, path);
                 string filename;
-                playlist.get (iter, 3, out filename);
+                playlist.get (iter, Columns.FILENAME, out filename);
                 play (File.new_for_commandline_arg (filename));
                 change_current_symbol (iter);
                 this.current = int.parse (path.to_string ());
             });
 
             this.reorderable = true;
-            this.model.row_inserted.connect ( (path, iter) => {
+            this.model.row_inserted.connect ((path, iter) => {
                 Gtk.TreeIter it;
                 playlist.get_iter (out it, path);
                 Gdk.Pixbuf playing;
-                playlist.get (it, 0, out playing);
+                playlist.get (it, Columns.PLAYING, out playing);
                 if (playing != null) //if playing is not null it's the current item
                     this.current = int.parse (path.to_string ());
             });
-
-            var css_fix = new Gtk.CssProvider ();
-            try {
-                css_fix.load_from_data ("
-                    * {
-                        background-image:none;
-                        background-color:@transparent;
-                        border-color:@transparent;
-                    }", -1);
-            } catch (Error e) { warning (e.message); }
-            this.get_style_context ().add_provider (css_fix, 20000);
         }
 
         private inline void change_current_symbol (Gtk.TreeIter new_item) {
-            try{
-                playlist.set (new_item, 0, Gtk.IconTheme.get_default ().
-                    load_icon ("media-playback-start-symbolic", 16, 0));
-            }catch (Error e) { warning (e.message); }
             Gtk.TreeIter old_item;
             playlist.get_iter_from_string (out old_item, this.current.to_string ());
-            playlist.set (old_item, 0, null);
+            playlist.set (old_item, Columns.PLAYING, null);
+            playlist.set (new_item, Columns.PLAYING, new ThemedIcon ("media-playback-start-symbolic"));
         }
 
         public void next () {
-            Gtk.TreeIter it;
-            if (playlist.get_iter_from_string (out it, (this.current + 1).to_string ())){
+            Gtk.TreeIter iter;
+            if (playlist.get_iter_from_string (out iter, (this.current + 1).to_string ())){
                 string filename;
-                playlist.get (it, 3, out filename);
-                change_current_symbol (it);
+                playlist.get (iter, Columns.FILENAME, out filename);
+                change_current_symbol (iter);
                 current++;
                 play (File.new_for_commandline_arg (filename));
             }
         }
 
         public void previous () {
-            Gtk.TreeIter it;
-            if (playlist.get_iter_from_string (out it, (this.current - 1).to_string ())){
+            Gtk.TreeIter iter;
+            if (playlist.get_iter_from_string (out iter, (this.current - 1).to_string ())){
                 string filename;
-                playlist.get (it, 3, out filename);
-                change_current_symbol (it);
+                playlist.get (iter, Columns.FILENAME, out filename);
+                change_current_symbol (iter);
                 current--;
                 play (File.new_for_commandline_arg (filename));
             }
@@ -95,37 +100,67 @@
 
         public void add_item (File path) {
             Gtk.TreeIter iter;
-            Gdk.Pixbuf pix = null; //may becoming the thumb...
 
-            Gdk.Pixbuf? playing = null;
+            Icon? playing = null;
             Gtk.TreeIter dummy;
-            if (!playlist.get_iter_first (out dummy)){ //first item
-                try {
-                    playing = Gtk.IconTheme.get_default ().lookup_icon ("media-playback-start-symbolic",
-                        16, 0).load_symbolic ({0, 0, 0, 255}, null, null, null);
-                } catch (Error e) { warning (e.message); }
+            if (!playlist.get_iter_first (out dummy)){
+                playing = new ThemedIcon ("media-playback-start-symbolic");
             } else {
                 playing = null;
             }
 
             playlist.append (out iter);
-            playlist.set (iter, 0, playing, 1, pix,
-                                2, Audience.get_title (path.get_basename ()), 3, path.get_path ());
+            playlist.set (iter, Columns.PLAYING, playing,
+                                Columns.TITLE, Audience.get_title (path.get_basename ()),
+                                Columns.FILENAME, path.get_path ());
         }
 
         public void remove_item (File path) {
             /*not needed up to now*/
         }
+
         public File? get_first_item () {
-            Gtk.TreeIter it;
-            if (playlist.get_iter_from_string (out it, 0.to_string ())){
+            Gtk.TreeIter iter;
+            if (playlist.get_iter_first (out iter)){
                 string filename;
-                playlist.get (it, 3, out filename);
+                playlist.get (iter, Columns.FILENAME, out filename);
                 return File.new_for_commandline_arg (filename);
             }
             return null;
         }
 
+        public List<string> get_all_items () {
+            var list = new List<string> ();
+            playlist.foreach ((model, path, iter) => {
+                Value filename;
+                playlist.get_value (iter, Columns.FILENAME, out filename);
+                string name = filename.get_string ();
+                list.append (name);
+                return false;
+            });
+            return list.copy ();
+        }
+
+        public void save_playlist_config () {
+            var list = new List<string> ();
+            playlist.foreach ((model, path, iter) => {
+                Value filename;
+                playlist.get_value (iter, Columns.FILENAME, out filename);
+                string name = filename.get_string ();
+                list.append (name);
+                return false;
+            });
+
+            uint i = 0;
+            var videos = new string[list.length ()];
+            foreach (var filename in list) {
+                videos[i] = filename;
+                i++;
+            }
+
+            settings.last_played_videos = videos;
+        }
+
     }
 
-}
+}
\ No newline at end of file

=== added file 'src/Widgets/PlaylistPopover.vala'
--- src/Widgets/PlaylistPopover.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/PlaylistPopover.vala	2014-07-06 11:18:29 +0000
@@ -0,0 +1,116 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Corentin Noël <[e-mail]>
+ */
+
+public class Audience.Widgets.PlaylistPopover : Gtk.Popover {
+    Gtk.ScrolledWindow playlist_scrolled;
+    public PlaylistPopover () {
+        opacity = GLOBAL_OPACITY;
+        var grid = new Gtk.Grid ();
+        grid.row_spacing = 6;
+        grid.column_spacing = 12;
+        grid.margin = 6;
+
+        var fil   = new Gtk.Button.with_label (_("Add from Harddrive…"));
+        fil.image = new Gtk.Image.from_icon_name ("document-open", Gtk.IconSize.DIALOG);
+        var dvd   = new Gtk.Button.with_label (_("Play a DVD…"));
+        dvd.image = new Gtk.Image.from_icon_name ("media-cdrom", Gtk.IconSize.DIALOG);
+        dvd.no_show_all = true;
+        var net   = new Gtk.Button.with_label (_("Network File…"));
+        net.image = new Gtk.Image.from_icon_name ("internet-web-browser", Gtk.IconSize.DIALOG);
+
+        playlist_scrolled = new Gtk.ScrolledWindow (null, null);
+        var app = ((Audience.App) GLib.Application.get_default ());
+        playlist_scrolled.add (app.playlist);
+
+        fil.clicked.connect ( () => {
+            hide ();
+            app.run_open_file ();
+        });
+
+        dvd.clicked.connect ( () => {
+            hide ();
+            app.run_open_dvd ();
+        });
+
+        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);
+                video_player.playing = true;
+                pop.destroy ();
+            });
+            box.remove (net);
+            box.reorder_child (entry, 2);
+            entry.show ();*/
+        });
+
+        grid.attach (playlist_scrolled, 0, 0, 2, 1);
+        grid.attach (fil, 0, 1, 1, 1);
+        grid.attach (dvd, 1, 1, 1, 1);
+
+        //look for dvd
+        var disk_manager = DiskManager.get_default ();
+        foreach (var volume in disk_manager.get_volumes ()) {
+            dvd.no_show_all = false;
+            dvd.show ();
+        }
+
+        disk_manager.volume_found.connect ((vol) => {
+            dvd.no_show_all = false;
+            dvd.show ();
+        });
+
+        disk_manager.volume_removed.connect ((vol) => {
+            if (disk_manager.get_volumes ().length () <= 0) {
+                dvd.no_show_all = true;
+                dvd.hide ();
+            }
+        });
+
+        //grid.add (net);
+        add (grid);
+    }
+
+    //Override because the Popover doesn't auto-rejust his size.
+    public override void get_preferred_height (out int minimum_height, out int natural_height) {
+        base.get_preferred_height (out minimum_height, out natural_height);
+        int p_minimum_height;
+        int p_natural_height;
+        var app = ((Audience.App) GLib.Application.get_default ());
+        app.playlist.get_preferred_height (out p_minimum_height, out p_natural_height);
+        int temp_minimum_height = minimum_height + p_minimum_height;
+        int r_minimum_height;
+        int r_natural_height;
+        relative_to.get_preferred_height (out r_minimum_height, out r_natural_height);
+        if (temp_minimum_height < app.mainwindow.get_window ().get_height () - r_minimum_height*2) {
+            minimum_height = temp_minimum_height;
+        } else {
+            minimum_height = app.mainwindow.get_window ().get_height () - r_minimum_height*2;
+        }
+
+        int temp_natural_height = natural_height + p_natural_height;
+        if (temp_natural_height < app.mainwindow.get_window ().get_height () - r_natural_height*2) {
+            natural_height = temp_natural_height;
+        } else {
+            natural_height = minimum_height;
+        }
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/PreviewPopover.vala'
--- src/Widgets/PreviewPopover.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/PreviewPopover.vala	2014-07-06 11:18:29 +0000
@@ -0,0 +1,90 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Corentin Noël <[e-mail]>
+ */
+
+public class Audience.Widgets.PreviewPopover : Gtk.Popover {
+    public Clutter.Actor preview_actor;
+    dynamic Gst.Element preview_playbin;
+    Clutter.Texture video;
+    double ratio = 0;
+    public PreviewPopover () {
+        opacity = GLOBAL_OPACITY;
+        can_focus = false;
+        sensitive = false;
+        modal = false;
+
+        // connect gstreamer stuff
+        preview_playbin = Gst.ElementFactory.make ("playbin", "play");
+        preview_playbin.get_bus ().add_signal_watch ();
+        preview_playbin.get_bus ().message.connect ((msg) => {
+            switch (msg.type) {
+                case Gst.MessageType.STATE_CHANGED:
+                    break;
+                case Gst.MessageType.ASYNC_DONE:
+                    break;
+            }
+        });
+        video = new Clutter.Texture ();
+
+        dynamic Gst.Element video_sink = Gst.ElementFactory.make ("cluttersink", "source");
+        video_sink.texture = video;
+        preview_playbin.video_sink = video_sink;
+        var clutter = new GtkClutter.Embed ();
+        clutter.margin = 6;
+        var stage = (Clutter.Stage)clutter.get_stage ();
+        stage.background_color = {0, 0, 0, 0};
+        stage.use_alpha = true;
+
+        video.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.WIDTH, 0));
+        video.add_constraint (new Clutter.BindConstraint (stage, Clutter.BindCoordinate.HEIGHT, 0));
+
+        stage.add_child (video);
+        add (clutter);
+        //show_all ();
+        closed.connect (() => {preview_playbin.set_state (Gst.State.PAUSED);});
+    }
+
+    public void set_preview_uri (string uri) {
+        preview_playbin.set_state (Gst.State.READY);
+        preview_playbin.uri = uri;
+        preview_playbin.volume = 0.0;
+        
+        try {
+            var info = new Gst.PbUtils.Discoverer (10 * Gst.SECOND).discover_uri (uri);
+            var video = info.get_video_streams ();
+            if (video.data != null) {
+                var video_info = (Gst.PbUtils.DiscovererVideoInfo)video.data;
+                uint video_width = video_info.get_width ();
+                uint video_height = video_info.get_height ();
+                ratio = ((double) video_height) / ((double) video_width);
+                set_size_request (200, (int) (ratio*200));
+            }
+        } catch (Error e) {
+            warning (e.message);
+            return;
+        }
+    }
+
+    public void set_preview_progress (double progress) {
+        int64 length;
+        preview_playbin.query_duration (Gst.Format.TIME, out length);
+        preview_playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE, (int64)(double.max (progress, 0.0) * length));
+        preview_playbin.set_state (Gst.State.PLAYING);
+    }
+}
\ No newline at end of file

=== added file 'src/Widgets/SettingsPopover.vala'
--- src/Widgets/SettingsPopover.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/SettingsPopover.vala	2014-07-06 11:18:29 +0000
@@ -0,0 +1,166 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Corentin Noël <[e-mail]>
+ */
+
+public class Audience.Widgets.SettingsPopover : Gtk.Popover {
+    private Gtk.ComboBoxText languages;
+    private Gtk.ComboBoxText subtitles;
+    private Gtk.FileChooserButton external_subtitle_file;
+
+    public SettingsPopover () {
+        opacity = GLOBAL_OPACITY;
+
+        languages = new Gtk.ComboBoxText ();
+        subtitles = new Gtk.ComboBoxText ();
+        external_subtitle_file = new Gtk.FileChooserButton (_("External Subtitles"), Gtk.FileChooserAction.OPEN);
+
+        var lang_label = new Gtk.Label (_("Audio:"));
+        lang_label.halign = Gtk.Align.END;
+
+        var sub_label = new Gtk.Label (_("Subtitles:"));
+        sub_label.halign = Gtk.Align.END;
+
+        var sub_ext_label = new Gtk.Label (_("External Subtitles:"));
+        sub_ext_label.halign = Gtk.Align.END;
+
+        var setupgrid  = new Gtk.Grid ();
+        setupgrid.row_spacing = 6;
+        setupgrid.margin = 6;
+        setupgrid.attach (lang_label, 0, 1, 1, 1);
+        setupgrid.attach (languages, 1, 1, 1, 1);
+        setupgrid.attach (sub_label, 0, 2, 1, 1);
+        setupgrid.attach (subtitles, 1, 2, 1, 1);
+        setupgrid.attach (sub_ext_label, 0, 3, 1, 1);
+        setupgrid.attach (external_subtitle_file, 1, 3, 1, 1);
+        setupgrid.column_homogeneous = true;
+        setupgrid.column_spacing = 12;
+
+        external_subtitle_file.file_set.connect (() => {
+            VideoPlayer.get_default ().set_subtitle_uri (external_subtitle_file.get_uri ());
+        });
+
+        VideoPlayer.get_default ().external_subtitle_changed.connect ((uri) => {
+            external_subtitle_file.select_uri (uri);
+        });
+
+        subtitles.changed.connect (() => {
+            if (subtitles.active_id == null)
+                return;
+
+            var id = int.parse (subtitles.active_id);
+            VideoPlayer.get_default ().current_text = id;
+        });
+
+        languages.changed.connect ( () => { //place it here to not get problems
+            if (languages.active_id == null)
+                return;
+
+            VideoPlayer.get_default ().current_audio = int.parse (languages.active_id);
+        });
+
+        add (setupgrid);
+    }
+
+    public void setup_text () {
+        subtitles.sensitive = false;
+        if (subtitles.model.iter_n_children (null) > 0)
+            subtitles.remove_all ();
+
+        int n_text;
+        VideoPlayer.get_default ().playbin.get ("n-text", out n_text);
+        for (var i=0; i<n_text; i++) {
+            Gst.TagList tags = null;
+            Signal.emit_by_name (VideoPlayer.get_default ().playbin, "get-text-tags", i, out tags);
+            if (tags == null)
+                continue;
+
+            string desc;
+            string readable = null;
+            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);
+                var language = Gst.Tag.get_language_name (desc);
+                subtitles.append (i.to_string (), language == null ? desc : language);
+                subtitles.sensitive = true;
+            }
+        }
+
+        subtitles.append ("-1", _("None"));
+        subtitles.active_id = VideoPlayer.get_default ().current_text.to_string ();
+    }
+
+    public void setup_audio () {
+        languages.sensitive = false;
+        if (languages.model.iter_n_children (null) > 0)
+            languages.remove_all ();
+
+        int n_audio;
+        VideoPlayer.get_default ().playbin.get ("n-audio", out n_audio);
+        for (var i=0; i<n_audio; i++) {
+            Gst.TagList tags = null;
+            Signal.emit_by_name (VideoPlayer.get_default ().playbin, "get-audio-tags", i, out tags);
+            if (tags == null)
+                continue;
+
+            string desc;
+            string readable = null;
+            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);
+                languages.append (i.to_string (), readable == null ? desc : readable);
+                languages.sensitive = true;
+            }
+        }
+
+        if (languages.model.iter_n_children (null) <= 0) {
+            languages.append ("def", _("Default"));
+            languages.active = 0;
+        } else {
+            languages.active_id = VideoPlayer.get_default ().current_audio.to_string ();
+        }
+    }
+
+    public void next_audio () {
+        int current = int.parse (languages.active_id);
+        if (current < languages.model.iter_n_children (null) - 1) {
+            current++;
+        } else {
+            current = 0;
+        }
+
+        languages.active_id = current.to_string ();
+    }
+
+    public void next_text () {
+        int current = int.parse (subtitles.active_id);
+        if (current < subtitles.model.iter_n_children (null)) {
+            current++;
+        } else {
+            current = 0;
+        }
+
+        subtitles.active_id = current.to_string ();
+    }
+}
\ No newline at end of file

=== removed file 'src/Widgets/TagView.vala'
--- src/Widgets/TagView.vala	2014-05-15 07:10:20 +0000
+++ src/Widgets/TagView.vala	1970-01-01 00:00:00 +0000
@@ -1,253 +0,0 @@
-
-/*
-  The panel on the right hand side
-*/
-
-public const string LIGHT_WINDOW_STYLE = """
-    .content-view-window {
-        background-image:none;
-        background-color:@bg_color;
-        
-        border-radius: 6px;
-        
-        border-width:1px;
-        border-style: solid;
-        border-color: alpha (#000, 0.25);
-    }
-""";
-
-namespace Audience.Widgets
-{
-    public class TagView : GtkClutter.Actor
-    {
-        public bool expanded;
-        public Gtk.Grid taggrid;
-        public Audience.App app;
-        
-        public Gtk.ComboBoxText languages;
-        public Gtk.ComboBoxText subtitles;
-        private Gtk.FileChooserButton external_subtitle_file;
-        
-        private Granite.Drawing.BufferSurface buffer;
-        int shadow_blur = 30;
-        int shadow_x    = 0;
-        int shadow_y    = 0;
-        double shadow_alpha = 0.5;
-
-        bool currently_parsing = false;
-
-        public signal void select_external_subtitle (string uri);
-        
-        public TagView (Audience.App app) {
-            this.app      = app;
-            this.reactive = true;
-            this.buffer   = new Granite.Drawing.BufferSurface (100, 100);
-            
-            var notebook = new Granite.Widgets.StaticNotebook (false);
-            
-            /*tags*/
-            var tagview = new Gtk.ScrolledWindow (null, null);
-            taggrid = new Gtk.Grid ();
-            taggrid.column_spacing = 10;
-            taggrid.margin = 12;
-            tagview.add_with_viewport (taggrid);
-            
-            /*setup*/
-            var setupgrid  = new Gtk.Grid ();
-            this.languages = new Gtk.ComboBoxText ();
-            this.subtitles = new Gtk.ComboBoxText ();
-            this.external_subtitle_file = new Gtk.FileChooserButton (_("External Subtitles"), Gtk.FileChooserAction.OPEN);
-            var lang_lbl   = new LLabel.right (_("Audio")+":");
-            var sub_lbl    = new LLabel.right (_("Subtitles")+":");
-            var sub_ext_lbl = new LLabel.right (_("External Subtitles") + ":");
-            setupgrid.attach (lang_lbl,  0, 1, 1, 1);
-            setupgrid.attach (languages,                   1, 1, 1, 1);
-            setupgrid.attach (sub_lbl, 0, 2, 1, 1);
-            setupgrid.attach (subtitles,                   1, 2, 1, 1);
-            setupgrid.attach (sub_ext_lbl, 0, 3, 1, 1);
-            setupgrid.attach (this.external_subtitle_file, 1, 3, 1, 1);
-            setupgrid.column_homogeneous = true;
-            setupgrid.margin = 12;
-            setupgrid.column_spacing = 12;
-            
-            external_subtitle_file.file_set.connect (() => {
-                select_external_subtitle (external_subtitle_file.get_uri ());
-            });
-            app.video_player.external_subtitle_changed.connect ( (uri) => {
-                external_subtitle_file.set_uri (uri);
-            });
-            this.subtitles.changed.connect ( () => {
-                if (subtitles.active_id == null || currently_parsing)
-                    return;
-                var id = int.parse (this.subtitles.active_id);
-                app.video_player.current_text = id;
-            });
-            
-            languages.changed.connect ( () => { //place it here to not get problems
-                if (languages.active_id == null || currently_parsing)
-                    return;
-                app.video_player.current_audio = int.parse (this.languages.active_id);
-            });
-            
-            var playlist_scrolled = new Gtk.ScrolledWindow (null, null);
-            playlist_scrolled.add (this.app.playlist);
-            
-            notebook.append_page (playlist_scrolled, new Gtk.Label (_("Playlist")));
-            notebook.append_page (setupgrid, new Gtk.Label (_("Options")));
-            
-            /*draw the window stylish!*/
-            var css = new Gtk.CssProvider ();
-            try {
-                css.load_from_data (LIGHT_WINDOW_STYLE, -1);
-            } catch (Error e) { warning (e.message); }
-            
-            var draw_ref = new Gtk.Window ();
-            draw_ref.get_style_context ().add_class ("content-view-window");
-            draw_ref.get_style_context ().add_provider (css, Gtk.STYLE_PROVIDER_PRIORITY_FALLBACK);
-            
-            var w = -1; var h = -1;
-            this.get_widget ().size_allocate.connect ( () => {
-                if (w == this.get_widget ().get_allocated_width () && 
-                    h == this.get_widget ().get_allocated_height ())
-                    return;
-                w = this.get_widget ().get_allocated_width ();
-                h = this.get_widget ().get_allocated_height ();
-                
-                this.buffer = new Granite.Drawing.BufferSurface (w, h);
-                
-                this.buffer.context.rectangle (shadow_blur + shadow_x, 
-                    shadow_blur + shadow_y, w - shadow_blur*2 + shadow_x, h - shadow_blur*2 + shadow_y);
-                this.buffer.context.set_source_rgba (0, 0, 0, shadow_alpha);
-                this.buffer.context.fill ();
-                this.buffer.exponential_blur (shadow_blur / 2);
-                
-                draw_ref.get_style_context ().render_activity (this.buffer.context, 
-                    shadow_blur + shadow_x, shadow_blur + shadow_y, 
-                    w - shadow_blur*2 + shadow_x, h - shadow_blur*2 + shadow_y);
-            });
-            this.get_widget ().draw.connect ( (ctx) => {
-                ctx.set_operator (Cairo.Operator.SOURCE);
-                ctx.rectangle (0, 0, this.width, this.height);
-                ctx.set_source_rgba (0.0, 0.0, 0.0, 0.0);
-                ctx.fill ();
-                
-                ctx.set_source_surface (this.buffer.surface, 0, 0);
-                ctx.paint ();
-                
-                return false;
-            });
-            
-            var no_bg = new Gtk.CssProvider ();
-            try {
-                no_bg.load_from_data ("""
-                * {
-                    background-color: alpha(#fff, 0);
-                }
-                .view:selected:focused {
-                    color: @selected_bg_color;
-                }
-                """, -1);
-            } catch (Error e) { warning (e.message); }
-            setupgrid.get_parent ().get_style_context ().add_provider (no_bg, 20000);
-            app.playlist.get_style_context ().add_provider (no_bg, 20000);
-            
-            playlist_scrolled.margin = 3;
-            notebook.margin = shadow_blur + 2;
-            notebook.margin_top += 3;
-            this.get_widget ().get_style_context ().add_class ("content-view");
-            ((Gtk.Bin)this.get_widget ()).add (notebook);
-            this.get_widget ().show_all ();
-            this.width = 350;
-            this.opacity = 0;
-            this.expanded = false;
-        }
-        
-        public override void allocate (Clutter.ActorBox box, Clutter.AllocationFlags flags) {
-            //have a minimum height in order to not get the negative allocation warnings
-            if (box.y2 - box.y1 < 100) {
-                box.y2 = box.y1 + 100;
-            }
-            base.allocate (box, flags);
-        }
-        
-        public void expand (){
-            //make sure it comes from right bounds
-            x = get_stage ().width + 100;
-            
-            var x2 = this.get_stage ().width - this.width + 10;
-            this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, x:x2);
-            this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, opacity:255);
-            this.expanded = true;
-        }
-        
-        public void collapse (){
-            var x2 = this.get_stage ().width;
-            this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, x:x2);
-            this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, opacity:0);
-            this.expanded = false;
-        }
-        
-        public void setup_text_setup  () { setup_setup ("text"); }
-        public void setup_audio_setup () { setup_setup ("audio"); }
-        /*target is either "text" or "audio"*/
-        public void setup_setup (string target) {
-            currently_parsing = true;
-            
-            if (target == "audio" && languages.model.iter_n_children (null) > 0)
-                languages.remove_all ();
-            else if (target == "text" && subtitles.model.iter_n_children (null) > 0)
-                subtitles.remove_all ();
-            
-            Value num = 0;
-            app.video_player.playbin.get_property ("n-"+target, ref num);
-            
-            int used = 0;
-            for (var i=0;i<num.get_int ();i++) {
-                Gst.TagList tags = null;
-                Signal.emit_by_name (app.video_player.playbin, "get-"+target+"-tags", i, out tags);
-                if (tags == null)
-                    continue;
-                
-                string desc;
-                string readable = null;
-                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);
-
-                if (target == "audio" && desc != null) {
-                    this.languages.append (i.to_string (), readable == null ? desc : readable);
-                    used ++;
-                } else if (desc != null) {
-                    var language = Gst.Tag.get_language_name (desc);
-                    this.subtitles.append (i.to_string (), language == null ? desc : language);
-                    used ++;
-                }
-            }
-
-            if (target == "audio") {
-                
-                if (used == 0) {
-                    languages.append ("def", _("Default"));
-                    languages.active = 0;
-                    languages.sensitive = false;
-                } else {
-                    languages.sensitive = true;
-                    languages.active_id = app.video_player.current_audio.to_string ();
-                }
-            } else {
-                if (used == 0)
-                    subtitles.sensitive = false;
-                else
-                    subtitles.sensitive = true;
-                
-                subtitles.append ("-1", _("None"));
-                subtitles.active_id = app.video_player.current_text.to_string ();
-            }
-
-            currently_parsing = false;
-        }
-    }
-}

=== added file 'src/Widgets/TimeWidget.vala'
--- src/Widgets/TimeWidget.vala	1970-01-01 00:00:00 +0000
+++ src/Widgets/TimeWidget.vala	2014-07-06 11:18:29 +0000
@@ -0,0 +1,127 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Tom Beckmann <[e-mail]>
+ *              Corentin Noël <[e-mail]>
+ */
+
+public class Audience.Widgets.TimeWidget : Gtk.Grid {
+    public signal void slider_motion_event (Gdk.EventMotion event);
+
+    public Gtk.Label progression_label;
+    public Gtk.Label time_label;
+    public Gtk.Scale scale;
+    public signal void seeked (double val);
+    private Audience.Widgets.PreviewPopover preview_popover;
+    private bool is_seeking = false;
+    private bool released = true;
+    private uint timeout_id = 0;
+    private int original = 0;
+
+    public TimeWidget () {
+        orientation = Gtk.Orientation.HORIZONTAL;
+        column_spacing = 12;
+        halign = Gtk.Align.CENTER;
+        progression_label = new Gtk.Label ("");
+        time_label = new Gtk.Label ("");
+
+        scale = new Gtk.Scale.with_range (Gtk.Orientation.HORIZONTAL, 0, 1, 0.1);
+        scale.expand = true;
+        scale.draw_value = false;
+        scale.can_focus = false;
+        scale.events |= Gdk.EventMask.POINTER_MOTION_MASK;
+        scale.events |= Gdk.EventMask.LEAVE_NOTIFY_MASK;
+        scale.events |= Gdk.EventMask.ENTER_NOTIFY_MASK;
+        scale.button_press_event.connect ((event) => {
+            is_seeking = true;
+            released = false;
+
+            if (timeout_id != 0)
+                Source.remove (timeout_id);
+
+            timeout_id = Timeout.add (300, () => {
+                if (released == false)
+                    return true;
+                seeked (scale.get_value ());
+                is_seeking = false;
+
+                timeout_id = 0;
+
+                return false;
+            });
+
+            return false;
+        });
+
+        scale.enter_notify_event.connect ((event) => {
+            preview_popover.show_all ();
+            return false;
+        });
+
+        scale.leave_notify_event.connect ((event) => {
+            preview_popover.hide ();
+            return false;
+        });
+
+        // XXX: Store the original size because the popover doesn't update his x=0 position when resizing.
+        scale.motion_notify_event.connect ((event) => {
+            if (original == 0)
+                original = event.window.get_width ();
+
+            var pointing = preview_popover.pointing_to;
+            var distance = original - event.window.get_width ();
+            pointing.x = (int)(event.x) - event.window.get_width ()/2 - distance/2;
+            preview_popover.set_pointing_to ((Gdk.Rectangle)pointing);
+            preview_popover.set_preview_progress (((double)event.x)/((double)event.window.get_width ()));
+
+            slider_motion_event (event);
+
+            return false;
+        });
+
+        scale.button_release_event.connect ((event) => {released = true; return false;});
+        preview_popover = new Audience.Widgets.PreviewPopover ();
+        preview_popover.relative_to = this;
+
+        add (progression_label);
+        add (scale);
+        add (time_label);
+    }
+
+    public void set_preview_uri (string uri) {
+        preview_popover.set_preview_uri (uri);
+    }
+
+    public override void get_preferred_width (out int minimum_width, out int natural_width) {
+        base.get_preferred_width (out minimum_width, out natural_width);
+
+        if (parent.get_window () == null)
+            return;
+        var width = parent.get_window ().get_width ();
+        if (width > 0 && width >= minimum_width) {
+            natural_width = width;
+        }
+    }
+
+    public void set_progression_time (double current_time, double total_time) {
+        if (is_seeking == true)
+            return;
+        scale.set_value (current_time/total_time);
+        progression_label.label = seconds_to_time ((int)(current_time / 1000000000));
+        time_label.label = seconds_to_time ((int)((total_time - current_time) / 1000000000));
+    }
+}
\ No newline at end of file

=== removed file 'src/Widgets/TopPanel.vala'
--- src/Widgets/TopPanel.vala	2013-05-19 17:10:26 +0000
+++ src/Widgets/TopPanel.vala	1970-01-01 00:00:00 +0000
@@ -1,87 +0,0 @@
-
-namespace Audience.Widgets{
-
-    /*a bar only shown for fullscreen including volume and unfullscreen*/
-    public class TopPanel : Clutter.Box {
-
-        public Button exit;
-        public GtkClutter.Actor volume;
-        public Gtk.VolumeButton vol;
-
-        bool _hidden;
-        public bool hidden{
-            get { return _hidden; }
-            set {
-                if (_hidden && !value){
-                    this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 400, y : 0.0f);
-                }else if (!_hidden && value){
-                    this.animate (Clutter.AnimationMode.EASE_OUT_QUAD, 1000, y : -this.height);
-                }
-                this._hidden = value;
-            }
-        }
-
-        public signal void unfullscreen ();
-
-        public TopPanel () {
-            layout_manager = new Clutter.BoxLayout ();
-
-            this.exit   = new Button ("view-restore-symbolic", Gtk.Stock.LEAVE_FULLSCREEN);
-            this.volume = new GtkClutter.Actor ();
-            var buf     = new Clutter.Rectangle.with_color ({0,0,0,0});
-            this.vol    = new Gtk.VolumeButton ();
-            this.vol.use_symbolic = true;
-            this._hidden = true;
-
-            exit.reactive = true;
-            exit.y = 2;
-            exit.button_release_event.connect ((e) => {
-                unfullscreen ();
-                return true;
-            });
-
-            var css = new Gtk.CssProvider ();
-            try {
-                css.load_from_data ("""
-                * {
-                    color: #fff;
-                    transition: 2ms linear;
-                }
-                *:hover {
-                    color: #aaa;
-                    transition: 2ms linear;
-                }
-                .button {
-                    background-image: none;
-                    background-color: alpha (#000, 0);
-                    border-color: alpha (#000, 0);
-                    border-image: none;
-                    -unico-border-gradient: none;
-                    -unico-inner-stroke-width: 0px;
-                    -unico-outer-stroke-width: 0px;
-                }
-                """, -1);
-            }catch (Error e) { warning (e.message); }
-            this.vol.get_child ().get_style_context ().add_provider (css, 20000);
-            this.vol.get_style_context ().add_provider (css, 20000);
-
-            ((Gtk.Container)this.volume.get_widget ()).add (this.vol);
-            this.volume.get_widget ().draw.connect ( (ctx) => {
-                ctx.rectangle (0, 0, this.volume.width, this.volume.height);
-                ctx.set_operator (Cairo.Operator.SOURCE);
-                ctx.set_source_rgba (0, 0, 0, 0);
-                ctx.fill ();
-                return false;
-            });
-
-            buf.width = 10;
-
-            //this.add_child (this.volume); removed until we get it to control global volume
-            this.add_child (buf);
-            this.add_child (this.exit);
-
-            y = -height;
-        }
-    }
-}
-

=== modified file 'src/Widgets/VideoPlayer.vala'
--- src/Widgets/VideoPlayer.vala	2014-05-15 07:10:20 +0000
+++ src/Widgets/VideoPlayer.vala	2014-07-06 11:18:29 +0000
@@ -1,3 +1,24 @@
+// -*- Mode: vala; indent-tabs-mode: nil; tab-width: 4 -*-
+/*-
+ * Copyright (c) 2013-2014 Audience Developers (http://launchpad.net/pantheon-chat)
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authored by: Tom Beckmann <[e-mail]>
+ *              Corentin Noël <[e-mail]>
+ */
+
 using Clutter;
 
 enum PlayFlags {
@@ -14,14 +35,17 @@
     SOFT_COLORBALANCE = (1 << 10)
 }
 
-namespace Audience.Widgets
-{
-    public class VideoPlayer : Actor
-    {
-        
+namespace Audience.Widgets {
+    public class VideoPlayer : Actor {
+        private static VideoPlayer? video_player = null;
+        public static VideoPlayer get_default () {
+            if (video_player == null)
+                video_player = new VideoPlayer ();
+            return video_player;
+        }
+
         public bool at_end;
-        
-        bool paused;
+
         bool _playing;
         public bool playing {
             get {
@@ -30,47 +54,31 @@
             set {
                 if (value == playing)
                     return;
-                
-                controls.show_play_button (!value);
-                
-                playbin.set_state (value ? Gst.State.PLAYING : Gst.State.PAUSED);
 
                 set_screensaver (!value);
                 set_screenlock (!value);
-
-                if (!value) {
-                    paused = true;
-                    lock_hide ();
-                }
-                if (value && paused) {
-                    paused = false;
-                    unlock_hide ();
-                }
-
+                playbin.set_state (value ? Gst.State.PLAYING : Gst.State.PAUSED);
                 _playing = value;
             }
         }
-        
+
         public double progress {
             get {
                 int64 length, prog;
-                
                 playbin.query_duration (Gst.Format.TIME, out length);
                 playbin.query_position (Gst.Format.TIME, out prog);
-                
                 if (length == 0)
                     return 0;
-                
+
                 return prog / (double)length;
             }
             set {
                 int64 length;
                 playbin.query_duration (Gst.Format.TIME, out length);
-                playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE,
-                    (int64)(double.max (value, 0.0) * length));
+                playbin.seek_simple (Gst.Format.TIME, Gst.SeekFlags.FLUSH | Gst.SeekFlags.ACCURATE, (int64)(double.max (value, 0.0) * length));
             }
         }
-        
+
         public double volume {
             get {
                 return playbin.volume;
@@ -79,7 +87,7 @@
                 playbin.volume = value;
             }
         }
-        
+
         public string uri {
             owned get {
                 return playbin.current_uri;
@@ -101,38 +109,20 @@
                     warning (e.message);
                     return;
                 }
-                
+
                 intial_relayout = true;
-                
                 playing = false;
                 playbin.set_state (Gst.State.READY);
                 playbin.suburi = null;
                 subtitle_uri = null;
                 playbin.uri = value;
                 volume = 1.0;
-                controls.slider.set_preview_uri (value);
                 at_end = false;
-                
+
                 relayout ();
                 playing = true;
             }
         }
-        
-        bool _controls_hidden;
-        public bool controls_hidden
-        {
-            get { return _controls_hidden; }
-            set {
-                if (_controls_hidden && !value) {
-                    float y2 = get_stage ().height - controls.height;
-                    controls.animate (Clutter.AnimationMode.EASE_OUT_CUBIC, 300, y:y2);
-                } else if (!_controls_hidden && value){
-                    float y2 = get_stage ().height;
-                    controls.animate (Clutter.AnimationMode.EASE_IN_QUAD, 600, y:y2);
-                }
-                _controls_hidden = value;
-            }
-        }
 
         public int current_audio {
             get {
@@ -167,161 +157,73 @@
                 }
             }
         }
-        
+
         public dynamic Gst.Element playbin;
         Clutter.Texture video;
-        Controls controls;
-        TopPanel panel;
 
         uint video_width;
         uint video_height;
-        
-        // we will only hide if hide lock is 0
-        public int hide_lock = 0;
-        
-        uint hiding_timer;
-        
+
         public GnomeSessionManager session_manager;
         uint32 inhibit_cookie;
-        
-        public bool fullscreened { get; set; }
-        
+
         public signal void ended ();
         public signal void toggle_side_pane (bool show);
         public signal void text_tags_changed ();
         public signal void audio_tags_changed ();
-        public signal void show_open_context ();
-        public signal void exit_fullscreen ();
         public signal void error ();
         public signal void plugin_install_done ();
         public signal void configure_window (uint video_w, uint video_h);
+        public signal void progression_changed (double current_time, double total_time);
         public signal void external_subtitle_changed (string? uri);
         
-        public VideoPlayer ()
-        {
-            reactive = true;
-            
-            controls = new Controls ();
-            controls.add_constraint (new BindConstraint (this, BindCoordinate.WIDTH, 0));
-            controls.slider.preview.add_constraint (new BindConstraint (controls, Clutter.BindCoordinate.Y, -105.0f));
-            
-            panel = new TopPanel ();
-            
+        private VideoPlayer () {
             video = new Clutter.Texture ();
-            video.reactive = true;
-            
+
+            dynamic Gst.Element video_sink = Gst.ElementFactory.make ("cluttersink", "source");
+            video_sink.texture = video;
+
             playbin = Gst.ElementFactory.make ("playbin", "playbin");
-            var video_sink = Audience.get_clutter_sink ();
-            video_sink.texture = video;
-            
             playbin.video_sink = video_sink;
-            
+
             add_child (video);
-            add_child (controls);
-            add_child (panel);
-            add_child (controls.slider.preview);
-            
-            controls.slider.seeked.connect ( (v) => {
-                debug ("Seeked to %f", v);
-                progress = v;
-            });
             Timeout.add (100, () => {
                 int64 length, prog;
                 playbin.query_position (Gst.Format.TIME, out prog);
                 playbin.query_duration (Gst.Format.TIME, out length);
-                
                 if (length == 0)
                     return true;
-                
-                controls.slider.progress = prog / (double)length;
-                
-                controls.current.text = seconds_to_time ((int)(prog / 1000000000));
-                controls.remaining.text = "-" + seconds_to_time ((int)(length / 1000000000) - (int)(prog / 1000000000));
-                
+
+                progression_changed ((double)prog, (double)length);
                 return true;
             });
+
             playbin.about_to_finish.connect (() => {
                 at_end = true;
                 ended ();
             });
 
-            notify["fullscreened"].connect (() => {
-                if (hide_lock > 0)
-                    panel.hidden = !fullscreened;
-            });
-            panel.unfullscreen.connect (() => {
-                exit_fullscreen ();
-            });
-            
-            bool last_state = false;
-            controls.notify["hovered"].connect (() => {
-                if (controls.hovered == last_state)
-                    return;
-                
-                last_state = controls.hovered;
-
-                if (controls.hovered)
-                    lock_hide ();
-                else
-                    unlock_hide ();
-            });
-            
-            controls.open.clicked.connect (() => {
-                show_open_context ();
-            });
-            controls.play.clicked.connect (() => playing = !playing );
-            controls.view.clicked.connect (() => {
-                if (!controls.showing_view) {
-                    toggle_side_pane (true);
-                    controls.view.set_icon ("pane-hide-symbolic", Gtk.Stock.GO_FORWARD, "go-next-symbolic");
-                    controls.showing_view = true;
-                    
-                    lock_hide ();
-                } else {
-                    toggle_side_pane (false);
-                    controls.view.set_icon ("pane-show-symbolic", Gtk.Stock.GO_BACK, "go-previous-symbolic");
-                    controls.showing_view = false;
-                    
-                    unlock_hide ();
-                }
-            });
-            
-            panel.vol.value_changed.connect ( (value) => {
-                volume = value;
-            });
-            panel.vol.value = 1.0;
-            
             playbin.text_tags_changed.connect ((el) => {
                 var structure = new Gst.Structure.empty ("tags-changed");
                 structure.set_value ("type", "text");
                 el.post_message (new Gst.Message.application (el, (owned) structure));
             });
+
             playbin.audio_tags_changed.connect ((el) => {
                 var structure = new Gst.Structure.empty ("tags-changed");
                 structure.set_value ("type", "audio");
                 el.post_message (new Gst.Message.application (el, (owned) structure));
             });
-            
+
             playbin.get_bus ().add_signal_watch ();
             playbin.get_bus ().message.connect (watch);
         }
 
-        public void lock_hide () {
-            if (hide_lock == 0)
-                toggle_controls (true);
-            hide_lock++;
-        }
-        public void unlock_hide () {
-            hide_lock--;
-
-            if (hide_lock < 1)
-                toggle_controls (false);
-        }
-
         void watch () {
             var msg = playbin.get_bus ().peek ();
             if (msg == null)
                 return;
+
             switch (msg.type) {
                 case Gst.MessageType.APPLICATION:
                     if (msg.get_structure ().get_name () == "tags-changed") {
@@ -374,23 +276,7 @@
             }
         }
 
-        public override bool motion_event (Clutter.MotionEvent event)
-        {
-            if (!controls.slider.mouse_grabbed)
-                get_stage ().cursor_visible = true;
-            
-            Gst.State state;
-            playbin.get_state (out state, null, 0);
-            if (state == Gst.State.PLAYING) {
-                if (hiding_timer < 1)
-                    lock_hide ();
-                set_timeout ();
-            }
-            return true;
-        }
-
-        public void set_subtitle_uri (string? uri)
-        {
+        public void set_subtitle_uri (string? uri) {
             subtitle_uri = uri;
             if (!check_text_layer (subtitle_uri != null)) {
                 apply_subtitles ();
@@ -400,8 +286,7 @@
 
         // checks whether text layer has to be enabled
         // returns if apply_subtitles has been called
-        bool check_text_layer (bool enable)
-        {
+        bool check_text_layer (bool enable) {
             int flags;
             playbin.get ("flags", out flags);
 
@@ -419,8 +304,7 @@
         }
 
         // ported from totem bvw widget set_subtitle_uri
-        void apply_subtitles ()
-        {
+        void apply_subtitles () {
             int64 time;
             playbin.query_position (Gst.Format.TIME, out time);
 
@@ -434,7 +318,6 @@
             }
 
             playbin.suburi = subtitle_uri;
-
             if (current > Gst.State.READY) {
                 playbin.set_state (current);
                 playbin.get_state (null, null, Gst.CLOCK_TIME_NONE);
@@ -451,10 +334,9 @@
                 playbin.get_state (null, null, Gst.CLOCK_TIME_NONE);
             }
         }
-        
+
         bool intial_relayout = false;
-        public bool relayout ()
-        {
+        public bool relayout () {
             if (video_width < 1 || video_height < 1 || uri == null)
                 return false;
 
@@ -464,136 +346,100 @@
             }
 
             var stage = get_stage ();
-            
             var aspect = stage.width / video_width < stage.height / video_height ?
                 stage.width / video_width : stage.height / video_height;
             video.width  = video_width * aspect;
             video.height = video_height * aspect;
             video.x = (stage.width  - video.width)  / 2;
             video.y = (stage.height - video.height) / 2;
-            
-            if (controls.get_animation () != null)
-                controls.detach_animation ();
-            controls.y = controls_hidden ? stage.height : stage.height - controls.height;
-            
-            (controls.content as Clutter.Canvas).set_size ((int)controls.width, (int)controls.height);
-            controls.content.invalidate ();
-
-            panel.x = get_stage ().width - panel.width - 10;
-            controls.slider.preview.width = (float) video_width / video_height * controls.slider.preview.height;
 
             return true;
         }
-        
-        void show_error (string? message=null)
-        {
-            var dlg  = new Gtk.Dialog.with_buttons (_("Error"), null, Gtk.DialogFlags.MODAL, Gtk.Stock.OK, Gtk.ResponseType.OK);
+
+        void show_error (string? message=null) {
+            var dlg  = new Gtk.Dialog.with_buttons (_("Error"), null, Gtk.DialogFlags.MODAL, _("_OK"), Gtk.ResponseType.OK);
             var grid = new Gtk.Grid ();
-            var err  = new Gtk.Image.from_stock (Gtk.Stock.DIALOG_ERROR, Gtk.IconSize.DIALOG);
-            
+            var err  = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
             err.margin_right = 12;
+            
+            var err_label = new Gtk.Label ("");
+            err_label.set_markup ("<b>%s</b>".printf (_("Oops! Audience can't play this file!")));
+            
             grid.margin = 12;
             grid.attach (err, 0, 0, 1, 1);
-            grid.attach (new Widgets.LLabel.markup ("<b>"+
-                _("Oops! Audience can't play this file!")+"</b>"), 1, 0, 1, 1);
+            grid.attach (err_label, 1, 0, 1, 1);
             if (message != null)
-                grid.attach (new Widgets.LLabel (message), 1, 1, 1, 2);
+                grid.attach (new Gtk.Label (message), 1, 1, 1, 2);
 
             error ();
-            
             ((Gtk.Box)dlg.get_content_area ()).add (grid);
             dlg.show_all ();
             dlg.run ();
             dlg.destroy ();
         }
-    
-        void handle_missing_plugin (Gst.Message msg)
-        {
+
+        void handle_missing_plugin (Gst.Message msg) {
             var detail = Gst.PbUtils.missing_plugin_message_get_description (msg);
-            var dlg = new Gtk.Dialog.with_buttons ("Missing plugin", null,
-                Gtk.DialogFlags.MODAL);
+            var dlg = new Gtk.Dialog.with_buttons ("Missing plugin", null, Gtk.DialogFlags.MODAL);
             var grid = new Gtk.Grid ();
-            var err  = new Gtk.Image.from_stock (Gtk.Stock.DIALOG_ERROR, 
-                Gtk.IconSize.DIALOG);
-            var phrase = new Widgets.LLabel (_("Some media files need extra software to be played. Audience can install this software automatically."));
-        
+            var err  = new Gtk.Image.from_icon_name ("dialog-error", Gtk.IconSize.DIALOG);
+            var phrase = new Gtk.Label (_("Some media files need extra software to be played. Audience can install this software automatically."));
+
             err.margin_right = 12;
+
+            var err_label = new Gtk.Label ("");
+            err_label.set_markup ("<b>%s</b>".printf (_("Audience needs %s to play this file.").printf (detail)));
+
             grid.margin = 12;
             grid.attach (err, 0, 0, 1, 1);
-            grid.attach (new Widgets.LLabel.markup ("<b>"+
-                _("Audience needs %s to play this file.").printf (detail)+"</b>"), 1, 0, 1, 1);
+            grid.attach (err_label, 1, 0, 1, 1);
             grid.attach (phrase, 1, 1, 1, 2);
 
             dlg.add_button (_("Don't install"), 1);
             dlg.add_button (_("Install")+" "+detail, 0);
-        
+
             (dlg.get_content_area () as Gtk.Container).add (grid);
-
             dlg.show_all ();
             if (dlg.run () == 0) {
                 var installer = Gst.PbUtils.missing_plugin_message_get_installer_detail (msg);
                 var context = new Gst.PbUtils.InstallPluginsContext ();
-                Gst.PbUtils.install_plugins_async ({installer}, context,
-                () => { //finished
-                    debug ("Finished plugin install\n");
+                Gst.PbUtils.install_plugins_async ({installer}, context, () => { //finished
+                    debug ("Finished plugin install");
                     Gst.update_registry ();
                     plugin_install_done ();
                     playing = true;
                 });
             }
+
             dlg.destroy ();
         }
-        
-        void set_timeout ()
-        {
-            if (hiding_timer != 0)
-                Source.remove (hiding_timer);
-            
-            hiding_timer = GLib.Timeout.add (2000, () => {
-                unlock_hide ();
-                hiding_timer = 0;
-                return false;
-            });
-        }
-        
-        void toggle_controls (bool show)
-        {
-            if (show) {
-                controls_hidden = false;
-                get_stage ().cursor_visible = true;
-                if (fullscreened)
-                    panel.hidden = false;
-            } else {
-                get_stage ().cursor_visible = false;
-                controls_hidden = true;
-                panel.hidden = true;
-            }
-        }        
-        
+
+        //TODO: Remove X Dependency!
         //store the default values for setting back
         X.Display dpy; int timeout = -1; int interval; int prefer_blanking; int allow_exposures;
-        void set_screensaver (bool enable)
-        {
+        void set_screensaver (bool enable) {
             if (dpy == null)
                 dpy = new X.Display ();
-            
+
             if (timeout == -1)
                 dpy.get_screensaver (out timeout, out interval, out prefer_blanking, out allow_exposures);
+
             dpy.set_screensaver (enable ? timeout : 0, interval, prefer_blanking, allow_exposures);
         }
-        
+
         //prevent screenlocking in Gnome 3 using org.gnome.SessionManager
-        void set_screenlock (bool enable)
-        {
-            try{
+        void set_screenlock (bool enable) {
+            try {
                 session_manager = Bus.get_proxy_sync (BusType.SESSION, 
                         "org.gnome.SessionManager", "/org/gnome/SessionManager");
                 if (enable) {
                     session_manager.Uninhibit (inhibit_cookie);
-                }else{
+                } else {
                     inhibit_cookie = session_manager.Inhibit ("audience", 0, "Playing Video using Audience", 12);
                 }
-            } catch (Error e) { warning (e.message); }
+            } catch (Error e) {
+                warning (e.message);
+            }
         }
     }
-}
+}
\ No newline at end of file