Merge branch 'tmp' into dev

Conflicts:
	Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.pdf
	Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex

diff --cc Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex
index 685f95faac118482aa8826ba9e00a07281a42fc3,f76f55a15f526fa7f112757761c8d23b16fe73f0..c9e8bc77ec5f067648408fd0f7b816a80522aa07
--- 1/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex
--- 2/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex
+++ b/Conferences/2014_EcoAc/Telemeta_EcoAcoustics_2014_06.tex
@@@ -322,129 -320,32 +320,128 @@@
  \end{frame}
  
  
++<<<<<<< HEAD
 +\begin{frame}
 +  \frametitle{SABIOD: Scaled Acoustic Biodiversity (prototype)}
 +  \begin{center}
 +    \includegraphics[width=1\textwidth]{img/shots/SABIOD_2014_5}
 +  \end{center}
 +\end{frame}
 +
 +
 +\subsection{DIADEMS}
 +\frame{\frametitle{The DIADEMS project}
 +\begin{itemize}
 +    \item \chref{http://www.irit.fr/recherches/SAMOVA/DIADEMS/fr/welcome/&cultureKey=en}{DIADEMS} : Description, Indexation, Access to Sound and Ethnomusicological Documents
 +    \item Granted by ANR : french national research agency (ANR-12-CORD-0022)     
 +    \item 3 years, 8 partners, 850 k\euro
 +    \item Apply and test MIR algorithms on large scale ethnomusicological data
 +    \item Define some high level interfaces to find new ways of explorations in large complex musical corpus
 +    \item New modes of collaboration between human science and computer science laboratories and researchers
 +    \item Define the \chref{http://files.parisson.com/telemeta/telemeta-doc/DIADEMS/thesaurus/Thesaurus/Thesaurus.html}{vocabulary} describing musical events in the usecase of ethnomusicilogy vs. signal processing
 +    \item \dchref{http://www.irit.fr/recherches/SAMOVA/DIADEMS/fr/welcome/}
 +    \item \dchref{http://diadems.telemeta.org}
 +\end{itemize}
 +}
 +
 +\frame{\frametitle{DIADEMS - Partners}
 +\begin{itemize}
 +\item Sponsors:
 +\begin{itemize}
 + \item CNRS
 + \item Huma-Num (ex TGE Adonis)
 + \item ANR
 + \item CREM
 + \item UPMC
 + \item Parisson
 +\end{itemize}
 +
 +\vspace{0.25cm}
 +
 +\item Partners :
 +\begin{itemize}
 +\item IRIT (université Paul Sabatier, Toulouse 3)
 +\item LIMSI (universités Pierre et Marie Curie (UPMC, Paris 6) et Paris-Sud)
 +\item LAM (institut Jean Le Rond d'Alembert, UPMC)
 +\item LABRI (université de Bordeaux)
 +\item CREM (université Paris Ouest Nanterre La Défense)
 +\item LESC (université Paris Ouest Nanterre La Défense)
 +\item Museum d'Histoire Naturelle de Paris
 +\item Musée du Quai Branly
 +\end{itemize}
 +
 +\end{itemize}
 +
 +\begin{center}
 +\begin{columns}[c]
 +\column{2.5cm}
 +\begin{center}
 +\pgfimage[width=1cm]{img/logo-CNRS}\end{center}
 +\column{2.5cm}
 +\begin{center}
 +\pgfimage[width=2.5cm]{img/Logo-CREM-La.jpg}
 +\end{center}
 +\column{2.5cm}
 +\begin{center}
 +\pgfimage[width=2.5cm]{img/parisson_logo_200}\end{center}
 +\column{2cm}
 +\begin{center}
 +\pgfimage[width=1.2cm]{img/logo-mnhn}\end{center}
 +\end{columns}
 +\end{center}
 +
 +}
 +
 +
 +\section{Development}
++=======
+ 
+ \section{Conclusion}
++>>>>>>> tmp
  \frame{\tableofcontents[currentsection]}
  
- \frame{\frametitle{Development board}
- \begin{block}{Links}
-     \begin{itemize}
-     \item \dchref{http://telemeta.org}
-     \item \dchref{https://github.com/yomguy/Telemeta/}
-     \item \dchref{https://github.com/yomguy/TimeSide/}
-     \item \dchref{https://github.com/Parisson/Telemeta-doc/}
-     \end{itemize}
- \end{block}
- \begin{block}{Team}
+ \subsection{Current development}
+ \frame{\frametitle{Current development - The SABIOD project}
+ \begin{block}{Bioacoustics - SABIOD}
      \begin{itemize}
-      \item Guillaume Pellerin
-      \item Thomas Fillon
-      \item Paul Brossier
-      \item Riccardo Zaccarelli
-      \item Maxime Lecoz
-      \item David Doukan
+     \item Add support for phylogeny and various bio taxonomies to Telemeta
+     \item Add bioacoustic detection models to TimeSide (bats, dolphins, whales, etc...)
+     \item Extend audio sampling frequencies
+     \item Automatic synchronization from hardware audio source 
      \end{itemize}
  \end{block}
- 
  }
  
++<<<<<<< HEAD
 +
 +\frame{\frametitle{Development - Lessons}
 +\begin{block}{Lessons from a 7 year old project}
 +\begin{itemize}
 +\item Simplicity is better than complexity (KISS principle)
 +\item Modularity is only accessible with a flexible language (thanks Python!)
 +\item Models and Objects are more important than Technologies
 +\item A good workflow is defined by the users themselves through feedback and constant revisions
 +\item Prototyping is a crucial part of the development process
 +\item A good platform relies on standards, not on formats
 +\item The Open Source ecosystem gives some \textbf{tremendous} possibilities to develop, deploy and scale any platform project
 +\end{itemize}
 +\end{block}
 +}
 +
 +
 +\frame{\frametitle{Development - TODO list}
++=======
+ \frame{\frametitle{Current development}
+ \footnotesize
++>>>>>>> tmp
  \begin{block}{Telemeta}
      \begin{itemize}
-     \item Update code to support Django new Class based views
-     \item Rewrite geolocation services
-     \item Public and enhanced user playlists
-     \item Smart breadcrumbs 
-     \item Better interactions with TimeSide
+     %\item Update code to support Django new Class based views
+     \item Update web framework (DJANGO) and geolocation services
+         %\item Smart breadcrumbs 
+     %\item Better interactions with TimeSide
      \item Enhance user interface (full HTML 5 + web audio API)
-         \begin{itemize}
+         \begin{itemize}\footnotesize
              \item For annotations and segmentations in a collaborative manner
              \item Provide import capabilities and feedback loop between manual and automatic annotations
              \item Fancy displays of automatic analysis results (zoomable + synchronized with audio)