[Init] Add initial source files

Signed-off-by: Regis Merlino <regis.merlino@intel.com>

26 files changed, 3024 insertions, 0 deletions

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..549bfe3
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,39 @@
+*.o
+*.lo
+*~
+*.la
+*.pc
+*.tgz
+*.gz
+.dirstamp
+
+Makefile
+Makefile.in
+aclocal.m4
+autom4te.cache/
+compile
+config.guess
+config.h
+config.h.in
+config.log
+config.status
+config.sub
+configure
+depcomp
+install-sh
+libtool
+ltmain.sh
+missing
+.deps/
+.libs/
+stamp-h1
+INSTALL
+
+m4/libtool.m4
+m4/ltoptions.m4
+m4/ltsugar.m4
+m4/ltversion.m4
+m4/lt~obsolete.m4
+
+dleyna-core-1.0.pc
+
diff --git a/COPYING b/COPYING
new file mode 100644
index 0000000..4362b49
--- /dev/null
+++ b/COPYING
@@ -0,0 +1,502 @@
+                  GNU LESSER GENERAL PUBLIC LICENSE
+                       Version 2.1, February 1999
+
+ Copyright (C) 1991, 1999 Free Software Foundation, Inc.
+ 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+[This is the first released version of the Lesser GPL.  It also counts
+ as the successor of the GNU Library Public License, version 2, hence
+ the version number 2.1.]
+
+                            Preamble
+
+  The licenses for most software are designed to take away your
+freedom to share and change it.  By contrast, the GNU General Public
+Licenses are intended to guarantee your freedom to share and change
+free software--to make sure the software is free for all its users.
+
+  This license, the Lesser General Public License, applies to some
+specially designated software packages--typically libraries--of the
+Free Software Foundation and other authors who decide to use it.  You
+can use it too, but we suggest you first think carefully about whether
+this license or the ordinary General Public License is the better
+strategy to use in any particular case, based on the explanations below.
+
+  When we speak of free software, we are referring to freedom of use,
+not price.  Our General Public Licenses are designed to make sure that
+you have the freedom to distribute copies of free software (and charge
+for this service if you wish); that you receive source code or can get
+it if you want it; that you can change the software and use pieces of
+it in new free programs; and that you are informed that you can do
+these things.
+
+  To protect your rights, we need to make restrictions that forbid
+distributors to deny you these rights or to ask you to surrender these
+rights.  These restrictions translate to certain responsibilities for
+you if you distribute copies of the library or if you modify it.
+
+  For example, if you distribute copies of the library, whether gratis
+or for a fee, you must give the recipients all the rights that we gave
+you.  You must make sure that they, too, receive or can get the source
+code.  If you link other code with the library, you must provide
+complete object files to the recipients, so that they can relink them
+with the library after making changes to the library and recompiling
+it.  And you must show them these terms so they know their rights.
+
+  We protect your rights with a two-step method: (1) we copyright the
+library, and (2) we offer you this license, which gives you legal
+permission to copy, distribute and/or modify the library.
+
+  To protect each distributor, we want to make it very clear that
+there is no warranty for the free library.  Also, if the library is
+modified by someone else and passed on, the recipients should know
+that what they have is not the original version, so that the original
+author's reputation will not be affected by problems that might be
+introduced by others.
+
+  Finally, software patents pose a constant threat to the existence of
+any free program.  We wish to make sure that a company cannot
+effectively restrict the users of a free program by obtaining a
+restrictive license from a patent holder.  Therefore, we insist that
+any patent license obtained for a version of the library must be
+consistent with the full freedom of use specified in this license.
+
+  Most GNU software, including some libraries, is covered by the
+ordinary GNU General Public License.  This license, the GNU Lesser
+General Public License, applies to certain designated libraries, and
+is quite different from the ordinary General Public License.  We use
+this license for certain libraries in order to permit linking those
+libraries into non-free programs.
+
+  When a program is linked with a library, whether statically or using
+a shared library, the combination of the two is legally speaking a
+combined work, a derivative of the original library.  The ordinary
+General Public License therefore permits such linking only if the
+entire combination fits its criteria of freedom.  The Lesser General
+Public License permits more lax criteria for linking other code with
+the library.
+
+  We call this license the "Lesser" General Public License because it
+does Less to protect the user's freedom than the ordinary General
+Public License.  It also provides other free software developers Less
+of an advantage over competing non-free programs.  These disadvantages
+are the reason we use the ordinary General Public License for many
+libraries.  However, the Lesser license provides advantages in certain
+special circumstances.
+
+  For example, on rare occasions, there may be a special need to
+encourage the widest possible use of a certain library, so that it becomes
+a de-facto standard.  To achieve this, non-free programs must be
+allowed to use the library.  A more frequent case is that a free
+library does the same job as widely used non-free libraries.  In this
+case, there is little to gain by limiting the free library to free
+software only, so we use the Lesser General Public License.
+
+  In other cases, permission to use a particular library in non-free
+programs enables a greater number of people to use a large body of
+free software.  For example, permission to use the GNU C Library in
+non-free programs enables many more people to use the whole GNU
+operating system, as well as its variant, the GNU/Linux operating
+system.
+
+  Although the Lesser General Public License is Less protective of the
+users' freedom, it does ensure that the user of a program that is
+linked with the Library has the freedom and the wherewithal to run
+that program using a modified version of the Library.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.  Pay close attention to the difference between a
+"work based on the library" and a "work that uses the library".  The
+former contains code derived from the library, whereas the latter must
+be combined with the library in order to run.
+
+                  GNU LESSER GENERAL PUBLIC LICENSE
+   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+
+  0. This License Agreement applies to any software library or other
+program which contains a notice placed by the copyright holder or
+other authorized party saying it may be distributed under the terms of
+this Lesser General Public License (also called "this License").
+Each licensee is addressed as "you".
+
+  A "library" means a collection of software functions and/or data
+prepared so as to be conveniently linked with application programs
+(which use some of those functions and data) to form executables.
+
+  The "Library", below, refers to any such software library or work
+which has been distributed under these terms.  A "work based on the
+Library" means either the Library or any derivative work under
+copyright law: that is to say, a work containing the Library or a
+portion of it, either verbatim or with modifications and/or translated
+straightforwardly into another language.  (Hereinafter, translation is
+included without limitation in the term "modification".)
+
+  "Source code" for a work means the preferred form of the work for
+making modifications to it.  For a library, complete source code means
+all the source code for all modules it contains, plus any associated
+interface definition files, plus the scripts used to control compilation
+and installation of the library.
+
+  Activities other than copying, distribution and modification are not
+covered by this License; they are outside its scope.  The act of
+running a program using the Library is not restricted, and output from
+such a program is covered only if its contents constitute a work based
+on the Library (independent of the use of the Library in a tool for
+writing it).  Whether that is true depends on what the Library does
+and what the program that uses the Library does.
+
+  1. You may copy and distribute verbatim copies of the Library's
+complete source code as you receive it, in any medium, provided that
+you conspicuously and appropriately publish on each copy an
+appropriate copyright notice and disclaimer of warranty; keep intact
+all the notices that refer to this License and to the absence of any
+warranty; and distribute a copy of this License along with the
+Library.
+
+  You may charge a fee for the physical act of transferring a copy,
+and you may at your option offer warranty protection in exchange for a
+fee.
+
+  2. You may modify your copy or copies of the Library or any portion
+of it, thus forming a work based on the Library, and copy and
+distribute such modifications or work under the terms of Section 1
+above, provided that you also meet all of these conditions:
+
+    a) The modified work must itself be a software library.
+
+    b) You must cause the files modified to carry prominent notices
+    stating that you changed the files and the date of any change.
+
+    c) You must cause the whole of the work to be licensed at no
+    charge to all third parties under the terms of this License.
+
+    d) If a facility in the modified Library refers to a function or a
+    table of data to be supplied by an application program that uses
+    the facility, other than as an argument passed when the facility
+    is invoked, then you must make a good faith effort to ensure that,
+    in the event an application does not supply such function or
+    table, the facility still operates, and performs whatever part of
+    its purpose remains meaningful.
+
+    (For example, a function in a library to compute square roots has
+    a purpose that is entirely well-defined independent of the
+    application.  Therefore, Subsection 2d requires that any
+    application-supplied function or table used by this function must
+    be optional: if the application does not supply it, the square
+    root function must still compute square roots.)
+
+These requirements apply to the modified work as a whole.  If
+identifiable sections of that work are not derived from the Library,
+and can be reasonably considered independent and separate works in
+themselves, then this License, and its terms, do not apply to those
+sections when you distribute them as separate works.  But when you
+distribute the same sections as part of a whole which is a work based
+on the Library, the distribution of the whole must be on the terms of
+this License, whose permissions for other licensees extend to the
+entire whole, and thus to each and every part regardless of who wrote
+it.
+
+Thus, it is not the intent of this section to claim rights or contest
+your rights to work written entirely by you; rather, the intent is to
+exercise the right to control the distribution of derivative or
+collective works based on the Library.
+
+In addition, mere aggregation of another work not based on the Library
+with the Library (or with a work based on the Library) on a volume of
+a storage or distribution medium does not bring the other work under
+the scope of this License.
+
+  3. You may opt to apply the terms of the ordinary GNU General Public
+License instead of this License to a given copy of the Library.  To do
+this, you must alter all the notices that refer to this License, so
+that they refer to the ordinary GNU General Public License, version 2,
+instead of to this License.  (If a newer version than version 2 of the
+ordinary GNU General Public License has appeared, then you can specify
+that version instead if you wish.)  Do not make any other change in
+these notices.
+
+  Once this change is made in a given copy, it is irreversible for
+that copy, so the ordinary GNU General Public License applies to all
+subsequent copies and derivative works made from that copy.
+
+  This option is useful when you wish to copy part of the code of
+the Library into a program that is not a library.
+
+  4. You may copy and distribute the Library (or a portion or
+derivative of it, under Section 2) in object code or executable form
+under the terms of Sections 1 and 2 above provided that you accompany
+it with the complete corresponding machine-readable source code, which
+must be distributed under the terms of Sections 1 and 2 above on a
+medium customarily used for software interchange.
+
+  If distribution of object code is made by offering access to copy
+from a designated place, then offering equivalent access to copy the
+source code from the same place satisfies the requirement to
+distribute the source code, even though third parties are not
+compelled to copy the source along with the object code.
+
+  5. A program that contains no derivative of any portion of the
+Library, but is designed to work with the Library by being compiled or
+linked with it, is called a "work that uses the Library".  Such a
+work, in isolation, is not a derivative work of the Library, and
+therefore falls outside the scope of this License.
+
+  However, linking a "work that uses the Library" with the Library
+creates an executable that is a derivative of the Library (because it
+contains portions of the Library), rather than a "work that uses the
+library".  The executable is therefore covered by this License.
+Section 6 states terms for distribution of such executables.
+
+  When a "work that uses the Library" uses material from a header file
+that is part of the Library, the object code for the work may be a
+derivative work of the Library even though the source code is not.
+Whether this is true is especially significant if the work can be
+linked without the Library, or if the work is itself a library.  The
+threshold for this to be true is not precisely defined by law.
+
+  If such an object file uses only numerical parameters, data
+structure layouts and accessors, and small macros and small inline
+functions (ten lines or less in length), then the use of the object
+file is unrestricted, regardless of whether it is legally a derivative
+work.  (Executables containing this object code plus portions of the
+Library will still fall under Section 6.)
+
+  Otherwise, if the work is a derivative of the Library, you may
+distribute the object code for the work under the terms of Section 6.
+Any executables containing that work also fall under Section 6,
+whether or not they are linked directly with the Library itself.
+
+  6. As an exception to the Sections above, you may also combine or
+link a "work that uses the Library" with the Library to produce a
+work containing portions of the Library, and distribute that work
+under terms of your choice, provided that the terms permit
+modification of the work for the customer's own use and reverse
+engineering for debugging such modifications.
+
+  You must give prominent notice with each copy of the work that the
+Library is used in it and that the Library and its use are covered by
+this License.  You must supply a copy of this License.  If the work
+during execution displays copyright notices, you must include the
+copyright notice for the Library among them, as well as a reference
+directing the user to the copy of this License.  Also, you must do one
+of these things:
+
+    a) Accompany the work with the complete corresponding
+    machine-readable source code for the Library including whatever
+    changes were used in the work (which must be distributed under
+    Sections 1 and 2 above); and, if the work is an executable linked
+    with the Library, with the complete machine-readable "work that
+    uses the Library", as object code and/or source code, so that the
+    user can modify the Library and then relink to produce a modified
+    executable containing the modified Library.  (It is understood
+    that the user who changes the contents of definitions files in the
+    Library will not necessarily be able to recompile the application
+    to use the modified definitions.)
+
+    b) Use a suitable shared library mechanism for linking with the
+    Library.  A suitable mechanism is one that (1) uses at run time a
+    copy of the library already present on the user's computer system,
+    rather than copying library functions into the executable, and (2)
+    will operate properly with a modified version of the library, if
+    the user installs one, as long as the modified version is
+    interface-compatible with the version that the work was made with.
+
+    c) Accompany the work with a written offer, valid for at
+    least three years, to give the same user the materials
+    specified in Subsection 6a, above, for a charge no more
+    than the cost of performing this distribution.
+
+    d) If distribution of the work is made by offering access to copy
+    from a designated place, offer equivalent access to copy the above
+    specified materials from the same place.
+
+    e) Verify that the user has already received a copy of these
+    materials or that you have already sent this user a copy.
+
+  For an executable, the required form of the "work that uses the
+Library" must include any data and utility programs needed for
+reproducing the executable from it.  However, as a special exception,
+the materials to be distributed need not include anything that is
+normally distributed (in either source or binary form) with the major
+components (compiler, kernel, and so on) of the operating system on
+which the executable runs, unless that component itself accompanies
+the executable.
+
+  It may happen that this requirement contradicts the license
+restrictions of other proprietary libraries that do not normally
+accompany the operating system.  Such a contradiction means you cannot
+use both them and the Library together in an executable that you
+distribute.
+
+  7. You may place library facilities that are a work based on the
+Library side-by-side in a single library together with other library
+facilities not covered by this License, and distribute such a combined
+library, provided that the separate distribution of the work based on
+the Library and of the other library facilities is otherwise
+permitted, and provided that you do these two things:
+
+    a) Accompany the combined library with a copy of the same work
+    based on the Library, uncombined with any other library
+    facilities.  This must be distributed under the terms of the
+    Sections above.
+
+    b) Give prominent notice with the combined library of the fact
+    that part of it is a work based on the Library, and explaining
+    where to find the accompanying uncombined form of the same work.
+
+  8. You may not copy, modify, sublicense, link with, or distribute
+the Library except as expressly provided under this License.  Any
+attempt otherwise to copy, modify, sublicense, link with, or
+distribute the Library is void, and will automatically terminate your
+rights under this License.  However, parties who have received copies,
+or rights, from you under this License will not have their licenses
+terminated so long as such parties remain in full compliance.
+
+  9. You are not required to accept this License, since you have not
+signed it.  However, nothing else grants you permission to modify or
+distribute the Library or its derivative works.  These actions are
+prohibited by law if you do not accept this License.  Therefore, by
+modifying or distributing the Library (or any work based on the
+Library), you indicate your acceptance of this License to do so, and
+all its terms and conditions for copying, distributing or modifying
+the Library or works based on it.
+
+  10. Each time you redistribute the Library (or any work based on the
+Library), the recipient automatically receives a license from the
+original licensor to copy, distribute, link with or modify the Library
+subject to these terms and conditions.  You may not impose any further
+restrictions on the recipients' exercise of the rights granted herein.
+You are not responsible for enforcing compliance by third parties with
+this License.
+
+  11. If, as a consequence of a court judgment or allegation of patent
+infringement or for any other reason (not limited to patent issues),
+conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot
+distribute so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you
+may not distribute the Library at all.  For example, if a patent
+license would not permit royalty-free redistribution of the Library by
+all those who receive copies directly or indirectly through you, then
+the only way you could satisfy both it and this License would be to
+refrain entirely from distribution of the Library.
+
+If any portion of this section is held invalid or unenforceable under any
+particular circumstance, the balance of the section is intended to apply,
+and the section as a whole is intended to apply in other circumstances.
+
+It is not the purpose of this section to induce you to infringe any
+patents or other property right claims or to contest validity of any
+such claims; this section has the sole purpose of protecting the
+integrity of the free software distribution system which is
+implemented by public license practices.  Many people have made
+generous contributions to the wide range of software distributed
+through that system in reliance on consistent application of that
+system; it is up to the author/donor to decide if he or she is willing
+to distribute software through any other system and a licensee cannot
+impose that choice.
+
+This section is intended to make thoroughly clear what is believed to
+be a consequence of the rest of this License.
+
+  12. If the distribution and/or use of the Library is restricted in
+certain countries either by patents or by copyrighted interfaces, the
+original copyright holder who places the Library under this License may add
+an explicit geographical distribution limitation excluding those countries,
+so that distribution is permitted only in or among countries not thus
+excluded.  In such case, this License incorporates the limitation as if
+written in the body of this License.
+
+  13. The Free Software Foundation may publish revised and/or new
+versions of the Lesser General Public License from time to time.
+Such new versions will be similar in spirit to the present version,
+but may differ in detail to address new problems or concerns.
+
+Each version is given a distinguishing version number.  If the Library
+specifies a version number of this License which applies to it and
+"any later version", you have the option of following the terms and
+conditions either of that version or of any later version published by
+the Free Software Foundation.  If the Library does not specify a
+license version number, you may choose any version ever published by
+the Free Software Foundation.
+
+  14. If you wish to incorporate parts of the Library into other free
+programs whose distribution conditions are incompatible with these,
+write to the author to ask for permission.  For software which is
+copyrighted by the Free Software Foundation, write to the Free
+Software Foundation; we sometimes make exceptions for this.  Our
+decision will be guided by the two goals of preserving the free status
+of all derivatives of our free software and of promoting the sharing
+and reuse of software generally.
+
+                            NO WARRANTY
+
+  15. BECAUSE THE LIBRARY IS LICENSED FREE OF CHARGE, THERE IS NO
+WARRANTY FOR THE LIBRARY, TO THE EXTENT PERMITTED BY APPLICABLE LAW.
+EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR
+OTHER PARTIES PROVIDE THE LIBRARY "AS IS" WITHOUT WARRANTY OF ANY
+KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE
+IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE
+LIBRARY IS WITH YOU.  SHOULD THE LIBRARY PROVE DEFECTIVE, YOU ASSUME
+THE COST OF ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN
+WRITING WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY
+AND/OR REDISTRIBUTE THE LIBRARY AS PERMITTED ABOVE, BE LIABLE TO YOU
+FOR DAMAGES, INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR
+CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OR INABILITY TO USE THE
+LIBRARY (INCLUDING BUT NOT LIMITED TO LOSS OF DATA OR DATA BEING
+RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD PARTIES OR A
+FAILURE OF THE LIBRARY TO OPERATE WITH ANY OTHER SOFTWARE), EVEN IF
+SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH
+DAMAGES.
+
+                     END OF TERMS AND CONDITIONS
+
+           How to Apply These Terms to Your New Libraries
+
+  If you develop a new library, and you want it to be of the greatest
+possible use to the public, we recommend making it free software that
+everyone can redistribute and change.  You can do so by permitting
+redistribution under these terms (or, alternatively, under the terms of the
+ordinary General Public License).
+
+  To apply these terms, attach the following notices to the library.  It is
+safest to attach them to the start of each source file to most effectively
+convey the exclusion of warranty; and each file should have at least the
+"copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the library's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser General Public
+    License as published by the Free Software Foundation; either
+    version 2.1 of the License, or (at your option) any later version.
+
+    This library 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+
+Also add information on how to contact you by electronic and paper mail.
+
+You should also get your employer (if you work as a programmer) or your
+school, if any, to sign a "copyright disclaimer" for the library, if
+necessary.  Here is a sample; alter the names:
+
+  Yoyodyne, Inc., hereby disclaims all copyright interest in the
+  library `Frob' (a library for tweaking knobs) written by James Random Hacker.
+
+  <signature of Ty Coon>, 1 April 1990
+  Ty Coon, President of Vice
+
+That's all there is to it!
diff --git a/ChangeLog b/ChangeLog
new file mode 100644
index 0000000..294d252
--- /dev/null
+++ b/ChangeLog
@@ -0,0 +1,3 @@
+version 0.0.1
+	- Initial version of dleyna-core
+
diff --git a/Makefile.am b/Makefile.am
new file mode 100644
index 0000000..7424011
--- /dev/null
+++ b/Makefile.am
@@ -0,0 +1,59 @@
+libdleyna_coreincdir = $(includedir)/dleyna-1.0/libdleyna/core
+connectordir = $(libdir)/dleyna-1.0/connectors
+sysconfigdir = $(sysconfdir)
+
+DLEYNA_CORE_VERSION = 1:0:0
+
+AM_CFLAGS =	$(GLIB_CFLAGS)				\
+		$(GIO_CFLAGS)				\
+		-include config.h			\
+		-DSYS_CONFIG_DIR="\"$(sysconfdir)\""	\
+		-DCONNECTOR_DIR="\"$(connectordir)\""
+
+ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
+
+lib_LTLIBRARIES = libdleyna-core-1.0.la
+
+libdleyna_coreinc_HEADERS = 	src/connector.h		\
+				src/connector-mgr.h	\
+				src/control-point.h	\
+				src/error.h		\
+				src/log.h		\
+				src/main-loop.h		\
+				src/settings.h		\
+				src/task-atom.h		\
+				src/task-processor.h
+
+
+libdleyna_core_1_0_la_LDFLAGS =	-version-info $(DLEYNA_CORE_VERSION) \
+				-no-undefined
+
+libdleyna_core_1_0_la_SOURCES =	$(libdleyna_coreinc_HEADERS)	\
+				src/connector-mgr.c		\
+				src/error.c			\
+				src/log.c			\
+				src/main-loop.c			\
+				src/settings.c			\
+				src/task-processor.c
+
+libdleyna_core_1_0_la_LIBADD =	$(GLIB_LIBS)	\
+				$(GIO_LIBS)
+
+MAINTAINERCLEANFILES =	Makefile.in		\
+			aclocal.m4		\
+			configure		\
+			config.h.in		\
+			config.h.in~		\
+			build-aux/depcomp	\
+			build-aux/compile	\
+			build-aux/missing	\
+			build-aux/install-sh
+
+pkgconfigdir = $(libdir)/pkgconfig
+pkgconfig_DATA = dleyna-core-1.0.pc
+
+CLEANFILES = $(pkgconfig_DATA)
+DISTCLEANFILES = $(pkgconfig_DATA)
+
+maintainer-clean-local:
+	rm -rf build-aux
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/NEWS
diff --git a/README b/README
new file mode 100644
index 0000000..7569ece
--- /dev/null
+++ b/README
@@ -0,0 +1,71 @@
+Introduction:
+-------------
+
+TODO
+
+Compilation
+------------
+
+TODO
+
+Working with the source code repository
+---------------------------------------
+
+dleyna-core can be downloaded, compiled and installed as
+follows:
+
+   Clone repository
+     # git clone git://github.com/01org/dleyna-core.git
+     # cd dleyna-core
+
+   Configure and build
+     # ./autoreconf -i
+     # ./configure
+     # make
+
+   Final installation
+     # sudo make install
+
+These instructions are suitable for users who simply want to install
+and run dleyna-core.  However, developers wishing to contribute
+to the project should follow a separate "Configure and build" step.
+
+   Configure and build
+     # ./bootstrap-configure
+     # make
+
+The script "bootstrap-configure" cleans the repository, calls
+autreconf and then invokes configure with proper settings for
+development.  These settings include the enabling of
+maintainer mode and debugging.
+
+Developers can remove autogenerated files with the following command
+
+     # make maintainer-clean
+
+Configure Options:
+------------------
+
+--enable-werror
+
+This option is disabled by default.  To enable use --enable-werror.
+When enabled, all warnings are treated as errors during compilation.
+Should be enabled during development to ensure that errors do not
+creep into the code base.  This option is enabled by
+bootstrap-configure.
+
+--enable-debug
+
+This option is disabled by default.  To enable use
+--enable-debug. When enabled, the make files produce debug builds.
+This option is enabled by bootstrap-configure.
+
+--enable-optimization
+
+This option is enabled by default. To disable use
+--disable-optimization. When enabled it turns on compiler
+optimizations. Disable = -O0, enable = -O2.
+
+--with-log-level
+
+See logging.txt for more information about logging.
diff --git a/bootstrap-configure b/bootstrap-configure
new file mode 100755
index 0000000..7a59366
--- /dev/null
+++ b/bootstrap-configure
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+if [ -f config.status ]; then
+	make maintainer-clean
+fi
+
+autoreconf -if && \
+    ./configure --enable-maintainer-mode \
+		--enable-silent-rules \
+		--disable-optimization \
+		--enable-debug \
+		--with-log-level=8 $*
diff --git a/configure.ac b/configure.ac
new file mode 100644
index 0000000..7e950ca
--- /dev/null
+++ b/configure.ac
@@ -0,0 +1,168 @@
+AC_PREREQ([2.66])
+
+AC_INIT([dleyna-core],
+	[0.0.1],
+	[https://github.com/01org/dleyna-core/issues/new],
+	,
+	[https://01.org/dleyna/])
+
+AC_CONFIG_HEADERS([config.h])
+AC_CONFIG_AUX_DIR([build-aux])
+AC_CONFIG_MACRO_DIR([m4])
+AC_CONFIG_SRCDIR([src/main-loop.c])
+
+AC_PREFIX_DEFAULT(/usr/local)
+
+AM_INIT_AUTOMAKE([subdir-objects])
+
+AM_MAINTAINER_MODE
+AM_SILENT_RULES([yes])
+
+DLEYNA_CORE_COMPILER_FLAGS
+
+# Checks for languages.
+AC_LANG_C
+
+# Checks for programs.
+AC_PROG_CC
+AM_PROG_CC_C_O
+AC_PROG_MKDIR_P
+
+# Initialize libtool
+# Disable generation of static libraries
+LT_PREREQ([2.2.6])
+LT_INIT([dlopen disable-static])
+LT_LANG([C])
+
+# Checks for libraries.
+PKG_PROG_PKG_CONFIG(0.16)
+PKG_CHECK_MODULES([GLIB], [glib-2.0 >= 2.28])
+PKG_CHECK_MODULES([GIO], [gio-2.0 >= 2.28])
+
+# Checks for header files.
+AC_CHECK_HEADERS([stdlib.h string.h syslog.h])
+
+# Checks for typedefs, structures, and compiler characteristics.
+AC_TYPE_UINT8_T
+AC_HEADER_STDBOOL
+AC_TYPE_SIZE_T
+
+# Checks for library functions.
+AC_FUNC_MALLOC
+AC_FUNC_REALLOC
+AC_CHECK_FUNCS([memset strchr strrchr strstr])
+
+# Define Log Level values
+LOG_LEVEL_0=0x00
+LOG_LEVEL_1=0x01
+LOG_LEVEL_2=0x02
+LOG_LEVEL_3=0x04
+LOG_LEVEL_4=0x08
+LOG_LEVEL_5=0x10
+LOG_LEVEL_6=0x20
+LOG_LEVEL_7=0x13
+LOG_LEVEL_8=0x3F
+
+AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_DISABLED], [${LOG_LEVEL_0}], [Log level flag for disabled messages])
+AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_ERROR],    [${LOG_LEVEL_1}], [Log level flag for errors])
+AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_CRITICAL], [${LOG_LEVEL_2}], [Log level flag for critical messages])
+AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_WARNING],  [${LOG_LEVEL_3}], [Log level flag for warnings])
+AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_MESSAGE],  [${LOG_LEVEL_4}], [Log level flag for messages])
+AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_INFO],     [${LOG_LEVEL_5}], [Log level flag for informational messages])
+AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_DEBUG],    [${LOG_LEVEL_6}], [Log level flag for debug messages])
+AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_DEFAULT],  [${LOG_LEVEL_7}], [Log level flag to display default level messages])
+AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL_ALL],      [${LOG_LEVEL_8}], [Log level flag for all messages])
+
+
+AC_ARG_ENABLE(debug,
+		AS_HELP_STRING(
+			[--enable-debug],
+			[enable compiling with debugging information]),
+		[],
+		[enable_debug=no])
+
+AS_CASE("${enable_debug}",
+	[yes], [CFLAGS="$CFLAGS -g";
+		AC_DEFINE_UNQUOTED([DLEYNA_DEBUG_ENABLED],[1], [Compiling with debugging information enabled])
+	       ],
+	[no], [],
+	[AC_MSG_ERROR([bad value ${enable_debug} for --enable-debug])])
+
+
+AC_ARG_ENABLE(werror,
+		AS_HELP_STRING(
+			[--enable-werror],
+			[warnings are treated as errors]),
+		[],
+		[enable_werror=no])
+
+AS_CASE("${enable_werror}",
+	[yes], [CFLAGS="$CFLAGS -Werror"],
+	[no], [],
+	[AC_MSG_ERROR([bad value ${enable_werror} for --enable-werror])])
+
+
+AC_ARG_ENABLE(optimization,
+		AS_HELP_STRING(
+			[--disable-optimization],
+			[disable code optimization through compiler]),
+		[],
+		[enable_optimization=yes])
+
+AS_CASE("${enable_optimization}",
+	[yes], [disable_optimization=no],
+	[no], [CFLAGS="$CFLAGS -O0"; disable_optimization=yes],
+	[AC_MSG_ERROR([bad value ${enable_optimization} for --enable-werror])])
+
+
+AC_DEFINE_UNQUOTED([DLEYNA_NEVER_QUIT], FALSE, [Default service behavior when last client disconnects])
+
+
+AC_DEFINE_UNQUOTED([DLEYNA_CONNECTOR_NAME], "dbus", [IPC connector name])
+
+
+AC_ARG_WITH(log-level,
+		AS_HELP_STRING(
+			[--with-log-level],
+			[enable logging information (0,1..6,7,8)\
+			 0=disabled \
+			 7=default (=1,2,5) \
+			 8=all (=1,2,3,4,5,6) \
+			 1,..,6=a comma separated list of log level\
+			]),
+		[],
+		[with_log_level=7])
+
+DLEYNA_LOG_LEVEL_CHECK([${with_log_level}])
+
+AC_DEFINE_UNQUOTED([DLEYNA_LOG_TYPE], 0, [Define log output technolgy])
+
+DLEYNA_CONNECTOR_LIB_PATTERN=libdleyna-connector-
+AC_SUBST(DLEYNA_CONNECTOR_LIB_PATTERN)
+AC_DEFINE([DLEYNA_CONNECTOR_LIB_PATTERN], "libdleyna-connector-",
+			       [Starting pattern for dleyna connector libraries])
+
+AC_SUBST([never_quit])
+AC_SUBST([with_connector_name])
+AC_SUBST([with_log_level])
+
+AC_CONFIG_FILES([Makefile \
+		 dleyna-core-1.0.pc])
+
+AC_OUTPUT
+
+AS_ECHO(["-------------------------------------------------
+
+${PACKAGE_NAME} Version ${PACKAGE_VERSION}
+
+Prefix    : '${prefix}'.
+Compiler  : '${CC}'
+CFLAGS    : '${CFLAGS}'
+
+-Package features:
+	- enable-werror       : ${enable_werror}
+	- enable-debug        : ${enable_debug}
+	- disable-optimization: ${disable_optimization}
+	- with-log-level      : ${with_log_level}
+
+--------------------------------------------------"])
diff --git a/dleyna-core-1.0.pc.in b/dleyna-core-1.0.pc.in
new file mode 100644
index 0000000..842c26b
--- /dev/null
+++ b/dleyna-core-1.0.pc.in
@@ -0,0 +1,12 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libexecdir=@libexecdir@
+includedir=${prefix}/include
+libdir=@libdir@
+
+Name: @PACKAGE@
+Description: UPnP & DLNA core library
+Libs: -L${libdir} -ldleyna-core-1.0
+Cflags: -I${includedir}/dleyna-1.0
+Requires: glib-2.0 gio-2.0
+Version: @VERSION@
\ No newline at end of file
diff --git a/m4/compiler-flags.m4 b/m4/compiler-flags.m4
new file mode 100644
index 0000000..04e5a14
--- /dev/null
+++ b/m4/compiler-flags.m4
@@ -0,0 +1,54 @@
+dnl
+dnl dleyna-core
+dnl
+dnl Copyright (C) 2013 Intel Corporation. All rights reserved.
+dnl
+dnl This program is free software; you can redistribute it and/or modify it
+dnl under the terms and conditions of the GNU Lesser General Public License,
+dnl version 2.1, as published by the Free Software Foundation.
+dnl
+dnl This program is distributed in the hope it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+dnl for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public License
+dnl along with this program; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+dnl
+dnl Regis Merlino <regis.merlino@intel.com>
+dnl
+
+AC_DEFUN_ONCE([DLEYNA_CORE_COMPILER_FLAGS], [
+	if (test x"${CFLAGS}" = x""); then
+		CFLAGS="-Wall"
+		CFLAGS+=" -O2"
+		CFLAGS+=" -D_FORTIFY_SOURCE=2"
+	fi
+
+	if (test x"$USE_MAINTAINER_MODE" = x"yes"); then
+		CFLAGS+=" -Wextra"
+		CFLAGS+=" -Wno-unused-parameter"
+		CFLAGS+=" -Wno-missing-field-initializers"
+		CFLAGS+=" -Wdeclaration-after-statement"
+		CFLAGS+=" -Wmissing-declarations"
+		CFLAGS+=" -Wredundant-decls"
+		CFLAGS+=" -Wcast-align"
+
+		CFLAGS+=" -Wstrict-prototypes"
+		CFLAGS+=" -Wmissing-prototypes"
+		CFLAGS+=" -Wnested-externs"
+		CFLAGS+=" -Wshadow"
+		CFLAGS+=" -Wformat=2"
+		CFLAGS+=" -Winit-self"
+
+		CFLAGS+=" -std=gnu99"
+		CFLAGS+=" -pedantic"
+		CFLAGS+=" -Wno-overlength-strings"
+
+		CFLAGS+=" -DG_DISABLE_DEPRECATED"
+		CFLAGS+=" -DGLIB_DISABLE_DEPRECATION_WARNINGS"
+	fi
+
+	CFLAGS+=" -Wno-format-extra-args"
+])
diff --git a/m4/log.m4 b/m4/log.m4
new file mode 100644
index 0000000..36082cc
--- /dev/null
+++ b/m4/log.m4
@@ -0,0 +1,81 @@
+dnl
+dnl dleyna-core
+dnl
+dnl Copyright (C) 2012 Intel Corporation. All rights reserved.
+dnl
+dnl This program is free software; you can redistribute it and/or modify it
+dnl under the terms and conditions of the GNU Lesser General Public License,
+dnl version 2.1, as published by the Free Software Foundation.
+dnl
+dnl This program is distributed in the hope it will be useful, but WITHOUT
+dnl ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+dnl FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+dnl for more details.
+dnl
+dnl You should have received a copy of the GNU Lesser General Public License
+dnl along with this program; if not, write to the Free Software Foundation, Inc.,
+dnl 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+dnl
+dnl Ludovic Ferrandis <ludovic.ferrandis@intel.com>
+dnl
+
+
+AC_DEFUN([_DLEYNA_LOG_LEVEL_CHECK_VALUE],
+[
+	AS_CASE($1,
+		[[[1-6]]], [AS_IF([test ${log_array[[${log_level}]]} -ne 0],
+				[
+					AC_MSG_ERROR(["$1 should be set once"], 1)
+				],
+				[test "x${log_single}" = xyes],
+				[
+					AC_MSG_ERROR(["Unique value element already set"], 1)
+				])
+			],
+
+		[0|7|8], [AS_IF([test ${log_level_count} -ne 0],
+				[
+					AC_MSG_ERROR(["$1 should be a unique value element"], 1)
+				])
+			  log_single=yes
+			],
+
+		[AC_MSG_ERROR(["$1 is not a valid value"], 1)]
+	)
+
+	log_name=LOG_LEVEL_${log_level}
+	eval log_value=\$${log_name}
+	let "LOG_LEVEL |= ${log_value}"
+]
+)
+
+AC_DEFUN([DLEYNA_LOG_LEVEL_CHECK],
+[
+	AC_MSG_CHECKING([for --with-log-level=$1])
+
+	old_IFS=${IFS}
+	IFS=","
+
+	log_ok=yes
+	log_single=no
+	log_level_count=0
+	LOG_LEVEL=0
+	log_array=(0 0 0 0 0 0 0 0 0)
+
+	for log_level in $1
+	do
+		IFS=${old_IFS}
+		_DLEYNA_LOG_LEVEL_CHECK_VALUE([$log_level])
+		IFS=","
+
+		let log_level_count++
+		let log_array[[${log_level}]]++
+	done
+
+	IFS=${old_IFS}
+
+	AC_DEFINE_UNQUOTED([DLEYNA_LOG_LEVEL], [${LOG_LEVEL}], [Log level flag for debug messages])
+
+	AC_MSG_RESULT([ok])
+]
+)
diff --git a/src/connector-mgr.c b/src/connector-mgr.c
new file mode 100644
index 0000000..d1a6f93
--- /dev/null
+++ b/src/connector-mgr.c
@@ -0,0 +1,91 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Regis Merlino <regis.merlino@intel.com>
+ *
+ */
+
+#include <gmodule.h>
+#include <string.h>
+
+#include "connector-mgr.h"
+#include "log.h"
+
+static GHashTable *g_connectors = NULL;
+
+const dleyna_connector_t *dleyna_connector_mgr_load(const gchar *name)
+{
+	GModule *module;
+	const dleyna_connector_t *connector;
+	dleyna_connector_get_interface_t get_interface;
+	gchar *path;
+
+	DLEYNA_LOG_DEBUG("Enter");
+
+	path = g_strdup_printf("%s/%s%s.so", CONNECTOR_DIR,
+			       DLEYNA_CONNECTOR_LIB_PATTERN, name);
+	module = g_module_open(path, G_MODULE_BIND_LAZY);
+	g_free(path);
+
+	if (module) {
+		if (!g_connectors)
+			g_connectors = g_hash_table_new(g_direct_hash,
+							g_direct_equal);
+
+		if (g_module_symbol(module, "dleyna_connector_get_interface",
+				    (gpointer *)&get_interface)) {
+			connector = get_interface();
+			g_hash_table_insert(g_connectors, (gpointer)connector,
+					    module);
+		} else {
+			connector = NULL;
+			g_module_close(module);
+			DLEYNA_LOG_CRITICAL(
+					"Connector '%s' entry point not found",
+					name);
+		}
+
+	} else {
+		connector = NULL;
+		DLEYNA_LOG_CRITICAL("Connector '%s' not found", name);
+	}
+
+	DLEYNA_LOG_DEBUG("Exit");
+
+	return connector;
+}
+
+void dleyna_connector_mgr_release(const dleyna_connector_t *connector)
+{
+	GModule *module;
+
+	DLEYNA_LOG_DEBUG("Enter");
+
+	module = g_hash_table_lookup(g_connectors, connector);
+	if (module) {
+		g_module_close(module);
+
+		g_hash_table_remove(g_connectors, connector);
+		if (g_hash_table_size(g_connectors) == 0) {
+			g_hash_table_unref(g_connectors);
+			g_connectors = NULL;
+		}
+	}
+
+	DLEYNA_LOG_DEBUG("Exit");
+}
diff --git a/src/connector-mgr.h b/src/connector-mgr.h
new file mode 100644
index 0000000..f2424e1
--- /dev/null
+++ b/src/connector-mgr.h
@@ -0,0 +1,33 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Regis Merlino <regis.merlino@intel.com>
+ *
+ */
+
+#ifndef DLEYNA_CONNECTOR_MGR_H__
+#define DLEYNA_CONNECTOR_MGR_H__
+
+#include <glib.h>
+
+#include "connector.h"
+
+const dleyna_connector_t *dleyna_connector_mgr_load(const gchar *name);
+void dleyna_connector_mgr_release(const dleyna_connector_t *connector);
+
+#endif /* DLEYNA_CONNECTOR_MGR_H__ */
diff --git a/src/connector.h b/src/connector.h
new file mode 100644
index 0000000..24c5cbd
--- /dev/null
+++ b/src/connector.h
@@ -0,0 +1,116 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Regis Merlino <regis.merlino@intel.com>
+ *
+ */
+
+#ifndef DLEYNA_CONNECTOR_H__
+#define DLEYNA_CONNECTOR_H__
+
+#include <glib.h>
+
+typedef void *dleyna_connector_id_t;
+typedef void *dleyna_connector_msg_id_t;
+
+typedef gboolean (*dleyna_connector_initialize_t)(const gchar *server_info,
+						  const gchar *root_info,
+						  GQuark error_quark,
+						  gpointer user_data);
+typedef void (*dleyna_connector_shutdown_t)(void);
+
+typedef void (*dleyna_connector_connected_cb_t)
+					(dleyna_connector_id_t connection);
+typedef void (*dleyna_connector_disconnected_cb_t)(
+					dleyna_connector_id_t connection);
+typedef void (*dleyna_connector_connect_t)(
+			const gchar *server_name,
+			dleyna_connector_connected_cb_t connected_cb,
+			dleyna_connector_disconnected_cb_t disconnected_cb);
+
+typedef void (*dleyna_connector_client_new_cb_t)(const gchar *client_name);
+typedef void (*dleyna_connector_client_lost_cb_t)(const gchar *client_name);
+typedef gboolean (*dleyna_connector_watch_client_t)(const gchar *client_name);
+typedef void (*dleyna_connector_unwatch_client_t)(const gchar *client_name);
+typedef void (*dleyna_connector_set_client_lost_cb_t)
+				(dleyna_connector_client_lost_cb_t lost_cb);
+
+typedef void (*dleyna_connector_dispatch_cb_t)(
+					dleyna_connector_id_t connection,
+					const gchar *sender,
+					const gchar *object_id,
+					const gchar *interface,
+					const gchar *method,
+					GVariant *parameters,
+					dleyna_connector_msg_id_t message_id);
+typedef gboolean (*dleyna_connector_interface_filter_cb_t)(
+						const gchar *object_path,
+						const gchar *node,
+						const gchar *interface);
+typedef guint (*dleyna_connector_publish_object_t)(
+			dleyna_connector_id_t connection,
+			const gchar *object_path,
+			gboolean root,
+			guint interface_index,
+			const dleyna_connector_dispatch_cb_t *cb_table_1);
+typedef guint (*dleyna_connector_publish_subtree_t)(
+				dleyna_connector_id_t connection,
+				const gchar *object_path,
+				const dleyna_connector_dispatch_cb_t *cb_table,
+				guint cb_table_size,
+				dleyna_connector_interface_filter_cb_t cb);
+typedef void (*dleyna_connector_unpublish_object_t)(
+					dleyna_connector_id_t connection,
+					guint object_id);
+typedef void (*dleyna_connector_unpublish_subtree_t)(
+					dleyna_connector_id_t connection,
+					guint object_id);
+
+typedef void (*dleyna_connector_return_response_t)(
+					dleyna_connector_msg_id_t message_id,
+					GVariant *parameters);
+typedef void (*dleyna_connector_return_error_t)(
+					dleyna_connector_msg_id_t message_id,
+					const GError *error);
+typedef gboolean (*dleyna_connector_notify_t)(dleyna_connector_id_t connection,
+					   const gchar *object_path,
+					   const gchar *interface_name,
+					   const gchar *notification_name,
+					   GVariant *parameters,
+					   GError **error);
+
+typedef struct dleyna_connector_t_ dleyna_connector_t;
+struct dleyna_connector_t_ {
+	dleyna_connector_initialize_t initialize;
+	dleyna_connector_shutdown_t shutdown;
+	dleyna_connector_connect_t connect;
+	dleyna_connector_watch_client_t watch_client;
+	dleyna_connector_unwatch_client_t unwatch_client;
+	dleyna_connector_set_client_lost_cb_t set_client_lost_cb;
+	dleyna_connector_publish_object_t publish_object;
+	dleyna_connector_publish_subtree_t publish_subtree;
+	dleyna_connector_unpublish_object_t unpublish_object;
+	dleyna_connector_unpublish_subtree_t unpublish_subtree;
+	dleyna_connector_return_response_t return_response;
+	dleyna_connector_return_error_t return_error;
+	dleyna_connector_notify_t notify;
+};
+
+typedef const dleyna_connector_t *(*dleyna_connector_get_interface_t)(void);
+
+#endif /* DLEYNA_CONNECTOR_H__ */
diff --git a/src/control-point.h b/src/control-point.h
new file mode 100644
index 0000000..eeca47d
--- /dev/null
+++ b/src/control-point.h
@@ -0,0 +1,55 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Regis Merlino <regis.merlino@intel.com>
+ *
+ */
+
+#ifndef DLEYNA_CONTROL_POINT_H__
+#define DLEYNA_CONTROL_POINT_H__
+
+#include <glib.h>
+
+#include "connector.h"
+#include "settings.h"
+#include "task-processor.h"
+
+typedef void (*dleyna_control_point_initialize_t)(
+					const dleyna_connector_t *connector,
+					dleyna_task_processor_t *processor,
+					dleyna_settings_t *settings);
+typedef void (*dleyna_control_point_free_t)(void);
+
+typedef const gchar *(*dleyna_control_point_server_name_t)(void);
+typedef const gchar *(*dleyna_control_point_server_introspection_t)(void);
+typedef const gchar *(*dleyna_control_point_root_introspection_t)(void);
+
+typedef gboolean (*dleyna_control_point_start_service_t)(
+					dleyna_connector_id_t connection);
+
+typedef struct dleyna_control_point_t_ dleyna_control_point_t;
+struct dleyna_control_point_t_ {
+	dleyna_control_point_initialize_t initialize;
+	dleyna_control_point_free_t free;
+	dleyna_control_point_server_name_t server_name;
+	dleyna_control_point_server_introspection_t server_introspection;
+	dleyna_control_point_root_introspection_t root_introspection;
+	dleyna_control_point_start_service_t start_service;
+};
+
+#endif /* DLEYNA_CONTROL_POINT_H__ */
diff --git a/src/error.c b/src/error.c
new file mode 100644
index 0000000..3f28dcb
--- /dev/null
+++ b/src/error.c
@@ -0,0 +1,30 @@
+/*
+ * dleyna
+ *
+ * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Mark Ryan <mark.d.ryan@intel.com>
+ *
+ */
+
+#include <glib.h>
+
+#include "error.h"
+
+GQuark dleyna_error_quark(void)
+{
+	return g_quark_from_static_string("dleyna-error-quark");
+}
diff --git a/src/error.h b/src/error.h
new file mode 100644
index 0000000..2bb122f
--- /dev/null
+++ b/src/error.h
@@ -0,0 +1,50 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Mark Ryan <mark.d.ryan@intel.com>
+ *
+ */
+
+#ifndef DLEYNA_ERROR_H__
+#define DLEYNA_ERROR_H__
+
+#include <glib.h>
+
+enum dleyna_error_t_ {
+	DLEYNA_ERROR_BAD_PATH,
+	DLEYNA_ERROR_OBJECT_NOT_FOUND,
+	DLEYNA_ERROR_BAD_QUERY,
+	DLEYNA_ERROR_OPERATION_FAILED,
+	DLEYNA_ERROR_BAD_RESULT,
+	DLEYNA_ERROR_UNKNOWN_INTERFACE,
+	DLEYNA_ERROR_UNKNOWN_PROPERTY,
+	DLEYNA_ERROR_DEVICE_NOT_FOUND,
+	DLEYNA_ERROR_DIED,
+	DLEYNA_ERROR_CANCELLED,
+	DLEYNA_ERROR_NOT_SUPPORTED,
+	DLEYNA_ERROR_LOST_OBJECT,
+	DLEYNA_ERROR_BAD_MIME,
+	DLEYNA_ERROR_HOST_FAILED,
+	DLEYNA_ERROR_IO
+};
+typedef enum dleyna_error_t_ dleyna_error_t;
+
+#define DLEYNA_SERVER_ERROR (dleyna_error_quark())
+GQuark dleyna_error_quark(void);
+
+#endif /* DLEYNA_ERROR_H__ */
diff --git a/src/log.c b/src/log.c
new file mode 100644
index 0000000..95e411f
--- /dev/null
+++ b/src/log.c
@@ -0,0 +1,208 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Ludovic Ferrandis <ludovic.ferrandis@intel.com>
+ *
+ */
+
+#define _GNU_SOURCE
+
+#include <stdarg.h>
+#include <string.h>
+
+#include "log.h"
+
+typedef struct dleyna_log_t_ dleyna_log_t;
+struct dleyna_log_t_ {
+	int old_mask;
+	int mask;
+	dleyna_log_type_t log_type;
+	GLogLevelFlags flags;
+	GLogFunc old_handler;
+	gchar *log_domain;
+};
+
+static dleyna_log_t s_log_context;
+
+static void prv_get_mf(int log_level, int *mask, GLogLevelFlags *flags)
+{
+	*mask = 0;
+	*flags = 0;
+
+	if (log_level & DLEYNA_LOG_LEVEL_ERROR) {
+		*mask |= LOG_MASK(LOG_ERR);
+		*flags |= G_LOG_LEVEL_ERROR;
+	}
+
+	if (log_level & DLEYNA_LOG_LEVEL_CRITICAL) {
+		*mask |= LOG_MASK(LOG_CRIT);
+		*flags |= G_LOG_LEVEL_CRITICAL;
+	}
+
+	if (log_level & DLEYNA_LOG_LEVEL_WARNING) {
+		*mask |= LOG_MASK(LOG_WARNING);
+		*flags |= G_LOG_LEVEL_WARNING;
+	}
+
+	if (log_level & DLEYNA_LOG_LEVEL_MESSAGE) {
+		*mask |= LOG_MASK(LOG_NOTICE);
+		*flags |= G_LOG_LEVEL_MESSAGE;
+	}
+
+	if (log_level & DLEYNA_LOG_LEVEL_INFO) {
+		*mask |= LOG_MASK(LOG_INFO);
+		*flags |= G_LOG_LEVEL_INFO;
+	}
+
+	if (log_level & DLEYNA_LOG_LEVEL_DEBUG) {
+		*mask |= LOG_MASK(LOG_DEBUG);
+		*flags |= G_LOG_LEVEL_DEBUG;
+	}
+
+	if (*flags)
+		*flags |= G_LOG_FLAG_RECURSION | G_LOG_FLAG_FATAL;
+}
+
+static void prv_set_flags_from_param(void)
+{
+	int mask;
+	GLogLevelFlags flags;
+
+	prv_get_mf(DLEYNA_LOG_LEVEL, &mask, &flags);
+
+	s_log_context.mask = mask;
+	s_log_context.flags = flags;
+	s_log_context.log_type = DLEYNA_LOG_TYPE;
+}
+
+static void prv_handler(const gchar *log_domain,
+			GLogLevelFlags log_level,
+			const gchar *message,
+			gpointer data)
+{
+	dleyna_log_t *log_context = (dleyna_log_t *)(data);
+
+	if (g_strcmp0(log_domain, s_log_context.log_domain))
+		return;
+
+	if (log_context->flags & log_level)
+		g_log_default_handler(log_domain, log_level, message, data);
+}
+
+void dleyna_log_update_type_level(dleyna_log_type_t log_type, int log_level)
+{
+	int mask;
+	int compile_mask;
+	GLogLevelFlags flags;
+	GLogLevelFlags compile_flags;
+
+	s_log_context.log_type = log_type;
+
+	prv_get_mf(log_level, &mask, &flags);
+	prv_get_mf(DLEYNA_LOG_LEVEL, &compile_mask, &compile_flags);
+
+	/* log level read from conf file is a subset of log level
+	 * set at compile time.
+	 * Only keep subset flags from compile flags */
+
+	mask &= compile_mask;
+	flags &= compile_flags;
+
+	s_log_context.mask = mask;
+	s_log_context.flags = flags;
+
+	DLEYNA_LOG_INFO("Type[%d] Level[0x%02X] Mask[0x%02X] Flags[0x%02X]",
+			log_type, log_level, mask, flags);
+
+	(void) setlogmask(mask);
+}
+
+void dleyna_log_init(const char *program)
+{
+	int option = LOG_NDELAY | LOG_PID;
+	int old;
+
+#ifdef DLEYNA_DEBUG_ENABLED
+	option |= LOG_PERROR | LOG_CONS;
+#endif
+
+	memset(&s_log_context, 0, sizeof(s_log_context));
+	s_log_context.log_domain = g_strdup(program);
+	prv_set_flags_from_param();
+
+	openlog(basename(program), option, LOG_DAEMON);
+
+	old = setlogmask(LOG_MASK(LOG_INFO));
+	syslog(LOG_INFO, "dLeyna version %s", VERSION);
+	(void) setlogmask(s_log_context.mask);
+
+	s_log_context.old_mask = old;
+	s_log_context.old_handler = g_log_set_default_handler(
+							prv_handler,
+							&s_log_context);
+
+#if DLEYNA_LOG_LEVEL & DLEYNA_LOG_LEVEL_INFO
+	if (s_log_context.log_type != DLEYNA_LOG_TYPE_SYSLOG)
+		DLEYNA_LOG_INFO("dLeyna version %s", VERSION);
+#endif
+}
+
+void dleyna_log_finalize(void)
+{
+	(void) setlogmask(LOG_MASK(LOG_INFO));
+	syslog(LOG_INFO, "dLeyna: Exit");
+
+#if DLEYNA_LOG_LEVEL & DLEYNA_LOG_LEVEL_INFO
+	if (s_log_context.log_type != DLEYNA_LOG_TYPE_SYSLOG)
+		DLEYNA_LOG_INFO("dLeyna: Exit");
+#endif
+
+	(void) g_log_set_default_handler(s_log_context.old_handler, NULL);
+
+	(void) setlogmask(s_log_context.old_mask);
+	closelog();
+
+	g_free(s_log_context.log_domain);
+
+	memset(&s_log_context, 0, sizeof(s_log_context));
+}
+
+void dleyna_log_trace(int priority, GLogLevelFlags flags,
+		      const char *format, ...)
+{
+	va_list args;
+
+	va_start(args, format);
+
+	switch (s_log_context.log_type) {
+	case DLEYNA_LOG_TYPE_SYSLOG:
+		if (s_log_context.mask)
+			vsyslog(priority, format, args);
+		break;
+	case DLEYNA_LOG_TYPE_GLIB:
+		if (s_log_context.flags)
+			g_logv(s_log_context.log_domain, flags, format, args);
+		break;
+	case DLEYNA_LOG_TYPE_FILE:
+		break;
+	default:
+		break;
+	}
+
+	va_end(args);
+}
diff --git a/src/log.h b/src/log.h
new file mode 100644
index 0000000..7e7f7a9
--- /dev/null
+++ b/src/log.h
@@ -0,0 +1,136 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Ludovic Ferrandis <ludovic.ferrandis@intel.com>
+ *
+ */
+
+#ifndef DLEYNA_LOG_H__
+#define DLEYNA_LOG_H__
+
+#include <glib.h>
+#include <syslog.h>
+
+enum dleyna_log_type_t_ {
+	DLEYNA_LOG_TYPE_SYSLOG = 0,
+	DLEYNA_LOG_TYPE_GLIB,
+	DLEYNA_LOG_TYPE_FILE
+};
+typedef enum dleyna_log_type_t_ dleyna_log_type_t;
+
+void dleyna_log_init(const char *program);
+
+void dleyna_log_finalize(void);
+
+void dleyna_log_update_type_level(dleyna_log_type_t log_type, int log_level);
+
+void dleyna_log_trace(int priority, GLogLevelFlags flags,
+		      const char *format, ...)
+					__attribute__((format(printf, 3, 4)));
+
+/* Generic Logging macro
+ */
+#ifdef DLEYNA_DEBUG_ENABLED
+	#define DLEYNA_LOG_HELPER(priority, flags, fmt, ...)    \
+		do { \
+			dleyna_log_trace(priority, flags, "%s : %s() --- " fmt,\
+				      __FILE__, __func__, ## __VA_ARGS__); \
+		} while (0)
+#else
+	#define DLEYNA_LOG_HELPER(priority, flags, fmt, ...) \
+		do { \
+			dleyna_log_trace(priority, flags, fmt, ## __VA_ARGS__);\
+		} while (0)
+#endif
+
+
+/* Logging macro for error messages
+ */
+#if DLEYNA_LOG_LEVEL & DLEYNA_LOG_LEVEL_ERROR
+	#define DLEYNA_LOG_ERROR(...) \
+		DLEYNA_LOG_HELPER(LOG_ERR, G_LOG_LEVEL_ERROR, __VA_ARGS__, 0)
+#else
+	#define DLEYNA_LOG_ERROR(...)
+#endif
+
+
+/* Logging macro for critical messages
+ */
+#if DLEYNA_LOG_LEVEL & DLEYNA_LOG_LEVEL_CRITICAL
+	#define DLEYNA_LOG_CRITICAL(...) \
+		DLEYNA_LOG_HELPER(LOG_CRIT, G_LOG_LEVEL_CRITICAL, \
+				  __VA_ARGS__, 0)
+#else
+	#define DLEYNA_LOG_CRITICAL(...)
+#endif
+
+
+/* Logging macro for warning messages
+ */
+#if DLEYNA_LOG_LEVEL & DLEYNA_LOG_LEVEL_WARNING
+	#define DLEYNA_LOG_WARNING(...) \
+		DLEYNA_LOG_HELPER(LOG_WARNING, G_LOG_LEVEL_WARNING, \
+				  __VA_ARGS__, 0)
+#else
+	#define DLEYNA_LOG_WARNING(...)
+#endif
+
+
+/* Logging macro for messages
+ */
+#if DLEYNA_LOG_LEVEL & DLEYNA_LOG_LEVEL_MESSAGE
+	#define DLEYNA_LOG_MESSAGE(...) \
+		DLEYNA_LOG_HELPER(LOG_NOTICE, G_LOG_LEVEL_MESSAGE, \
+				  __VA_ARGS__, 0)
+#else
+	#define DLEYNA_LOG_MESSAGE(...)
+#endif
+
+
+/* Logging macro for informational messages
+ */
+#if DLEYNA_LOG_LEVEL & DLEYNA_LOG_LEVEL_INFO
+	#define DLEYNA_LOG_INFO(...) \
+		DLEYNA_LOG_HELPER(LOG_INFO, G_LOG_LEVEL_INFO, __VA_ARGS__, 0)
+#else
+	#define DLEYNA_LOG_INFO(...)
+#endif
+
+
+/* Logging macro for debug messages
+ */
+#if DLEYNA_LOG_LEVEL & DLEYNA_LOG_LEVEL_DEBUG
+	#define DLEYNA_LOG_DEBUG(...) \
+		DLEYNA_LOG_HELPER(LOG_DEBUG, G_LOG_LEVEL_DEBUG, __VA_ARGS__, 0)
+#else
+	#define DLEYNA_LOG_DEBUG(...)
+#endif
+
+
+/* Logging macro to display an empty line
+ */
+#if DLEYNA_LOG_LEVEL & DLEYNA_LOG_LEVEL_DEBUG
+	#define DLEYNA_LOG_DEBUG_NL() \
+		do { \
+			dleyna_log_trace(LOG_DEBUG, G_LOG_LEVEL_DEBUG, " "); \
+		} while (0)
+#else
+	#define DLEYNA_LOG_DEBUG_NL()
+#endif
+
+#endif /* DLEYNA_LOG_H__ */
diff --git a/src/main-loop.c b/src/main-loop.c
new file mode 100644
index 0000000..9105c91
--- /dev/null
+++ b/src/main-loop.c
@@ -0,0 +1,170 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Regis Merlino <regis.merlino@intel.com>
+ *
+ */
+
+#include <glib.h>
+#include <string.h>
+
+#include "connector-mgr.h"
+#include "control-point.h"
+#include "error.h"
+#include "log.h"
+#include "main-loop.h"
+#include "settings.h"
+#include "task-processor.h"
+
+typedef struct dleyna_daemon_context_t_ dleyna_daemon_context_t;
+struct dleyna_daemon_context_t_ {
+	gboolean error;
+	GMainLoop *main_loop;
+	dleyna_connector_id_t connection;
+	dleyna_task_processor_t *processor;
+	dleyna_settings_t *settings;
+	const dleyna_connector_t *connector;
+	const dleyna_control_point_t *control_point;
+};
+
+static dleyna_daemon_context_t g_context;
+
+static gboolean prv_context_quit_cb(gpointer user_data)
+{
+	DLEYNA_LOG_DEBUG("Quitting");
+
+	g_main_loop_quit(g_context.main_loop);
+
+	return FALSE;
+}
+
+static gboolean prv_context_init(const gchar *server,
+				 const dleyna_control_point_t *control_point)
+{
+	gboolean retval = TRUE;
+	const gchar *connector;
+
+	memset(&g_context, 0, sizeof(g_context));
+
+	g_context.processor = dleyna_task_processor_new(prv_context_quit_cb);
+	g_context.control_point = control_point;
+
+	dleyna_settings_new(server, &g_context.settings);
+
+	connector = dleyna_settings_connector_name(g_context.settings);
+	g_context.connector = dleyna_connector_mgr_load(connector);
+
+	if (!g_context.connector)
+		retval = FALSE;
+
+	return retval;
+}
+
+static void prv_connector_acquired(dleyna_connector_id_t connection)
+{
+	g_context.connection = connection;
+
+	if (!g_context.control_point->start_service(connection)) {
+		g_context.error = TRUE;
+		g_main_loop_quit(g_context.main_loop);
+	}
+}
+
+static void prv_name_lost(dleyna_connector_id_t connection)
+{
+	g_context.connection = NULL;
+	dleyna_task_processor_set_quitting(g_context.processor);
+}
+
+static void prv_context_free(void)
+{
+	dleyna_task_processor_free(g_context.processor);
+
+	if (g_context.connector) {
+		g_context.connector->shutdown();
+		dleyna_connector_mgr_release(g_context.connector);
+	}
+
+	if (g_context.main_loop)
+		g_main_loop_unref(g_context.main_loop);
+
+	if (g_context.settings)
+		dleyna_settings_delete(g_context.settings);
+}
+
+int dleyna_main_loop_start(char *server,
+			   const dleyna_control_point_t *control_point,
+			   gpointer user_data)
+{
+	int retval = 1;
+
+	g_type_init();
+
+	dleyna_log_init(server);
+
+	if (!prv_context_init(server, control_point))
+		goto out;
+
+	if (!g_context.connector->initialize(
+				g_context.control_point->server_introspection(),
+				g_context.control_point->root_introspection(),
+				dleyna_error_quark(),
+				user_data))
+		goto out;
+
+	g_context.main_loop = g_main_loop_new(NULL, FALSE);
+
+	g_context.connector->connect(g_context.control_point->server_name(),
+				     prv_connector_acquired,
+				     prv_name_lost);
+
+
+	g_context.control_point->initialize(g_context.connector,
+					    g_context.processor,
+					    g_context.settings);
+
+	g_main_loop_run(g_context.main_loop);
+	if (g_context.error)
+		goto on_error;
+
+	retval = 0;
+
+on_error:
+
+	g_context.control_point->free();
+
+out:
+
+	prv_context_free();
+
+	dleyna_log_finalize();
+
+	return retval;
+}
+
+static gboolean prv_set_quitting(gpointer user_data)
+{
+	dleyna_task_processor_set_quitting(g_context.processor);
+
+	return FALSE;
+}
+
+void dleyna_main_loop_quit(void)
+{
+	g_idle_add_full(G_PRIORITY_HIGH_IDLE, prv_set_quitting, NULL, NULL);
+}
diff --git a/src/main-loop.h b/src/main-loop.h
new file mode 100644
index 0000000..8b29dc7
--- /dev/null
+++ b/src/main-loop.h
@@ -0,0 +1,33 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Regis Merlino <regis.merlino@intel.com>
+ *
+ */
+
+#ifndef DLEYNA_MAIN_LOOP_H__
+#define DLEYNA_MAIN_LOOP_H__
+
+#include "connector.h"
+
+int dleyna_main_loop_start(char *server,
+			   const dleyna_control_point_t *control_point,
+			   gpointer user_data);
+void dleyna_main_loop_quit(void);
+
+#endif /* DLEYNA_MAIN_LOOP_H__ */
diff --git a/src/settings.c b/src/settings.c
new file mode 100644
index 0000000..701f527
--- /dev/null
+++ b/src/settings.c
@@ -0,0 +1,439 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Ludovic Ferrandis <ludovic.ferrandis@intel.com>
+ *
+ */
+
+#include <string.h>
+#include <gio/gio.h>
+
+#include "log.h"
+#include "settings.h"
+
+struct dleyna_settings_t_ {
+	GKeyFile *keyfile;
+	GFileMonitor *monitor;
+	gulong handler_id;
+	guint ev_id;
+	gchar *file_name;
+
+	/* Global section */
+	gboolean never_quit;
+	gchar *connector_name;
+
+	/* Log section */
+	dleyna_log_type_t log_type;
+	int log_level;
+};
+
+#define DLEYNA_SETTINGS_GROUP_GENERAL		"general"
+#define DLEYNA_SETTINGS_KEY_NEVER_QUIT		"never-quit"
+#define DLEYNA_SETTINGS_KEY_CONNECTOR_NAME	"connector-name"
+
+#define DLEYNA_SETTINGS_GROUP_LOG	"log"
+#define DLEYNA_SETTINGS_KEY_LOG_TYPE	"log-type"
+#define DLEYNA_SETTINGS_KEY_LOG_LEVEL	"log-level"
+
+#define DLEYNA_SETTINGS_DEFAULT_NEVER_QUIT	DLEYNA_NEVER_QUIT
+#define DLEYNA_SETTINGS_DEFAULT_CONNECTOR_NAME	DLEYNA_CONNECTOR_NAME
+#define DLEYNA_SETTINGS_DEFAULT_LOG_TYPE	DLEYNA_LOG_TYPE
+#define DLEYNA_SETTINGS_DEFAULT_LOG_LEVEL	DLEYNA_LOG_LEVEL
+
+#define DLEYNA_SETTINGS_LOG_KEYS(sys, loc, settings) \
+do { \
+	DLEYNA_LOG_DEBUG_NL(); \
+	DLEYNA_LOG_INFO("Load file [%s]", loc ? loc : sys); \
+	DLEYNA_LOG_DEBUG_NL(); \
+	DLEYNA_LOG_DEBUG("[General settings]"); \
+	DLEYNA_LOG_DEBUG("Never Quit: %s", (settings)->never_quit ? "T" : "F");\
+	DLEYNA_LOG_DEBUG_NL(); \
+	DLEYNA_LOG_DEBUG("Connector Name: %s", (settings)->connector_name);\
+	DLEYNA_LOG_DEBUG_NL(); \
+	DLEYNA_LOG_DEBUG("[Logging settings]"); \
+	DLEYNA_LOG_DEBUG("Log Type : %d", (settings)->log_type); \
+	DLEYNA_LOG_DEBUG("Log Level: 0x%02X", (settings)->log_level); \
+	DLEYNA_LOG_DEBUG_NL(); \
+} while (0)
+
+
+static void prv_get_keyfile_path(const gchar *file, gchar **sys_path,
+				 gchar **loc_path)
+{
+	const gchar *loc_dir;
+
+	if (sys_path != NULL) {
+		*sys_path = NULL;
+
+		if (*SYS_CONFIG_DIR)
+			*sys_path = g_strdup_printf("%s/%s", SYS_CONFIG_DIR,
+						    file);
+	}
+
+	if (loc_path != NULL) {
+		loc_dir =  g_get_user_config_dir();
+		*loc_path = NULL;
+
+		if (loc_dir && *loc_dir)
+			*loc_path = g_strdup_printf("%s/%s", loc_dir,
+						    file);
+	}
+}
+
+static void prv_check_local_keyfile(const gchar *sys_path,
+				    const gchar *loc_path)
+{
+	GFile *sys_file = NULL;
+	GFile *loc_file;
+	GFile *loc_dir;
+
+	loc_file = g_file_new_for_path(loc_path);
+	loc_dir = g_file_get_parent(loc_file);
+
+	if (g_file_query_exists(loc_file, NULL) || (sys_path == NULL))
+		goto exit;
+
+	if (!g_file_query_exists(loc_dir, NULL)) {
+		if (!g_file_make_directory(loc_dir, NULL, NULL))
+			goto exit;
+	}
+
+	sys_file = g_file_new_for_path(sys_path);
+
+	(void) g_file_copy(sys_file, loc_file, G_FILE_COPY_TARGET_DEFAULT_PERMS,
+			   NULL, NULL, NULL, NULL);
+
+exit:
+	if (loc_dir)
+		g_object_unref(loc_dir);
+
+	if (loc_file)
+		g_object_unref(loc_file);
+
+	if (sys_file)
+		g_object_unref(sys_file);
+}
+
+static GKeyFile *prv_load_keyfile(const gchar *filepath)
+{
+	GKeyFile *keyfile = NULL;
+
+	if (filepath == NULL)
+		goto exit;
+
+	keyfile = g_key_file_new();
+
+	if (!g_key_file_load_from_file(keyfile, filepath, G_KEY_FILE_NONE,
+				       NULL)) {
+		g_key_file_free(keyfile);
+		keyfile = NULL;
+	}
+
+exit:
+	return keyfile;
+}
+
+static int prv_to_log_level(gint *int_list, gsize length)
+{
+	gsize i;
+	int log_level_value;
+	int level;
+	int log_level_array[] = {
+		DLEYNA_LOG_LEVEL_DISABLED, DLEYNA_LOG_LEVEL_ERROR,
+		DLEYNA_LOG_LEVEL_CRITICAL, DLEYNA_LOG_LEVEL_WARNING,
+		DLEYNA_LOG_LEVEL_MESSAGE, DLEYNA_LOG_LEVEL_INFO,
+		DLEYNA_LOG_LEVEL_DEBUG, DLEYNA_LOG_LEVEL_DEFAULT,
+		DLEYNA_LOG_LEVEL_ALL };
+
+	log_level_value = 0;
+
+	/* Take all valid values, even duplicated ones, and skip all others.
+	 * Priority is single value (0,7,8) over multi value (1..6)
+	 * Priority for single values is first found */
+	for (i = 0; i < length; ++i) {
+		level = int_list[i];
+
+		if (level > 0 && level < 7) {
+			log_level_value |= log_level_array[level];
+		} else if ((level == 0) || (level == 7) || (level == 8)) {
+			log_level_value = log_level_array[level];
+			break;
+		}
+	}
+
+	return log_level_value;
+}
+
+static dleyna_log_type_t prv_to_log_type(int type)
+{
+	dleyna_log_type_t log_type = DLEYNA_LOG_TYPE_SYSLOG;
+
+	switch (type) {
+	case 0:
+		break;
+	case 1:
+		log_type = DLEYNA_LOG_TYPE_GLIB;
+		break;
+	default:
+		break;
+	}
+
+	return log_type;
+}
+
+static void prv_read_keys(dleyna_settings_t *settings)
+{
+	GError *error = NULL;
+	GKeyFile *keyfile = settings->keyfile;
+	gboolean b_val;
+	gint int_val;
+	gchar *s_val;
+	gint *int_star;
+	gsize length;
+
+	b_val = g_key_file_get_boolean(keyfile,
+				       DLEYNA_SETTINGS_GROUP_GENERAL,
+				       DLEYNA_SETTINGS_KEY_NEVER_QUIT,
+				       &error);
+
+	if (error == NULL) {
+		settings->never_quit = b_val;
+	} else {
+		g_error_free(error);
+		error = NULL;
+	}
+
+	s_val = g_key_file_get_string(keyfile,
+				      DLEYNA_SETTINGS_GROUP_GENERAL,
+				      DLEYNA_SETTINGS_KEY_CONNECTOR_NAME,
+				       &error);
+
+	if (error == NULL) {
+		g_free(settings->connector_name);
+		settings->connector_name = s_val;
+	} else {
+		g_error_free(error);
+		error = NULL;
+	}
+
+	int_val = g_key_file_get_integer(keyfile,
+					 DLEYNA_SETTINGS_GROUP_LOG,
+					 DLEYNA_SETTINGS_KEY_LOG_TYPE,
+					 &error);
+
+	if (error == NULL) {
+		settings->log_type = prv_to_log_type(int_val);
+	} else {
+		g_error_free(error);
+		error = NULL;
+	}
+
+	g_key_file_set_list_separator(keyfile, ',');
+
+	int_star = g_key_file_get_integer_list(keyfile,
+					       DLEYNA_SETTINGS_GROUP_LOG,
+					       DLEYNA_SETTINGS_KEY_LOG_LEVEL,
+					       &length,
+					       &error);
+
+	if (error == NULL) {
+		settings->log_level = prv_to_log_level(int_star,
+								    length);
+		g_free(int_star);
+	} else {
+		g_error_free(error);
+		error = NULL;
+	}
+}
+
+static void prv_init_default(dleyna_settings_t *settings)
+{
+	settings->never_quit = DLEYNA_SETTINGS_DEFAULT_NEVER_QUIT;
+	settings->connector_name = g_strdup(
+					DLEYNA_SETTINGS_DEFAULT_CONNECTOR_NAME);
+
+	settings->log_type = DLEYNA_SETTINGS_DEFAULT_LOG_TYPE;
+	settings->log_level = DLEYNA_SETTINGS_DEFAULT_LOG_LEVEL;
+}
+
+static void prv_keyfile_init(dleyna_settings_t *settings,
+			     const gchar *sys_path,
+			     const gchar *loc_path)
+{
+	settings->keyfile = prv_load_keyfile(loc_path);
+
+	if (settings->keyfile == NULL)
+		settings->keyfile = prv_load_keyfile(sys_path);
+
+	if (settings->keyfile != NULL) {
+		prv_read_keys(settings);
+		dleyna_log_update_type_level(settings->log_type,
+					     settings->log_level);
+	}
+}
+
+static void prv_keyfile_finalize(dleyna_settings_t *settings)
+{
+	if (settings->keyfile != NULL) {
+		g_key_file_free(settings->keyfile);
+		settings->keyfile = NULL;
+	}
+}
+
+static void prv_reload(dleyna_settings_t *settings)
+{
+	gchar *sys_path = NULL;
+	gchar *loc_path = NULL;
+
+	DLEYNA_LOG_INFO("Reload local configuration file");
+
+	prv_keyfile_finalize(settings);
+	prv_init_default(settings);
+	prv_get_keyfile_path(settings->file_name, &sys_path, &loc_path);
+
+	if (sys_path || loc_path)
+		prv_keyfile_init(settings, sys_path, loc_path);
+
+	DLEYNA_SETTINGS_LOG_KEYS(sys_path, loc_path, settings);
+
+	g_free(sys_path);
+	g_free(loc_path);
+}
+
+static gboolean prv_monitor_timout_cb(gpointer user_data)
+{
+	dleyna_settings_t *data = (dleyna_settings_t *)user_data;
+
+	DLEYNA_LOG_INFO("Change in local settings file: Reload");
+
+	prv_reload(data);
+
+	data->ev_id = 0;
+	return FALSE;
+}
+
+static void prv_monitor_keyfile_cb(GFileMonitor *monitor,
+				   GFile *file,
+				   GFile *other_file,
+				   GFileMonitorEvent event_type,
+				   gpointer user_data)
+{
+	dleyna_settings_t *data = (dleyna_settings_t *)user_data;
+
+	switch (event_type) {
+	case G_FILE_MONITOR_EVENT_CHANGED:
+	case G_FILE_MONITOR_EVENT_CHANGES_DONE_HINT:
+	case G_FILE_MONITOR_EVENT_DELETED:
+	case G_FILE_MONITOR_EVENT_CREATED:
+	case G_FILE_MONITOR_EVENT_MOVED:
+		/* Reset the timer to prevent running the cb if monitoring
+		 * event are raised 1 sec after the timer has been set */
+		if (data->ev_id != 0)
+			(void) g_source_remove(data->ev_id);
+
+		data->ev_id = g_timeout_add_seconds(1,
+						    prv_monitor_timout_cb,
+						    user_data);
+		break;
+	default:
+		break;
+	}
+}
+
+static void prv_monitor_local_keyfile(dleyna_settings_t *settings,
+				      const gchar *loc_path)
+{
+	GFile *loc_file;
+	GFileMonitor *monitor = NULL;
+	gulong handler_id;
+
+	loc_file = g_file_new_for_path(loc_path);
+	monitor = g_file_monitor_file(loc_file, G_FILE_MONITOR_SEND_MOVED, NULL,
+					NULL);
+	g_object_unref(loc_file);
+
+	if (monitor != NULL) {
+		handler_id = g_signal_connect(monitor, "changed",
+				G_CALLBACK(prv_monitor_keyfile_cb),
+				settings);
+
+		settings->monitor = monitor;
+		settings->handler_id = handler_id;
+	}
+}
+
+gboolean dleyna_settings_is_never_quit(dleyna_settings_t *settings)
+{
+	return settings->never_quit;
+}
+
+const gchar *dleyna_settings_connector_name(dleyna_settings_t *settings)
+{
+	return settings->connector_name;
+}
+
+void dleyna_settings_new(const gchar *server, dleyna_settings_t **settings)
+{
+	gchar *sys_path = NULL;
+	gchar *loc_path = NULL;
+	const gchar *server_name;
+
+	*settings = g_malloc0(sizeof(**settings));
+
+	server_name = strrchr(server, '/');
+	if (server_name)
+		server_name++;
+	else
+		server_name = server;
+	(*settings)->file_name = g_strdup_printf("%s%s", server_name, ".conf");
+
+	prv_init_default(*settings);
+
+	prv_get_keyfile_path((*settings)->file_name, &sys_path, &loc_path);
+
+	if (loc_path) {
+		prv_check_local_keyfile(sys_path, loc_path);
+		prv_monitor_local_keyfile(*settings, loc_path);
+	}
+
+	if (sys_path || loc_path)
+		prv_keyfile_init(*settings, sys_path, loc_path);
+
+	DLEYNA_SETTINGS_LOG_KEYS(sys_path, loc_path, *settings);
+
+	g_free(sys_path);
+	g_free(loc_path);
+}
+
+void dleyna_settings_delete(dleyna_settings_t *settings)
+{
+	if (settings->monitor) {
+		if (settings->handler_id)
+			g_signal_handler_disconnect(settings->monitor,
+						    settings->handler_id);
+
+		g_file_monitor_cancel(settings->monitor);
+		g_object_unref(settings->monitor);
+	}
+	g_free(settings->connector_name);
+	g_free(settings->file_name);
+
+	prv_keyfile_finalize(settings);
+
+	g_free(settings);
+}
diff --git a/src/settings.h b/src/settings.h
new file mode 100644
index 0000000..4274879
--- /dev/null
+++ b/src/settings.h
@@ -0,0 +1,36 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Ludovic Ferrandis <ludovic.ferrandis@intel.com>
+ *
+ */
+
+#ifndef DLEYNA_SETTINGS_H__
+#define DLEYNA_SETTINGS_H__
+
+#include <glib.h>
+
+typedef struct dleyna_settings_t_ dleyna_settings_t;
+
+void dleyna_settings_new(const gchar *server, dleyna_settings_t **settings);
+void dleyna_settings_delete(dleyna_settings_t *settings);
+
+gboolean dleyna_settings_is_never_quit(dleyna_settings_t *settings);
+const gchar *dleyna_settings_connector_name(dleyna_settings_t *settings);
+
+#endif /* DLEYNA_SETTINGS_H__ */
diff --git a/src/task-atom.h b/src/task-atom.h
new file mode 100644
index 0000000..255fe08
--- /dev/null
+++ b/src/task-atom.h
@@ -0,0 +1,33 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Regis Merlino <regis.merlino@intel.com>
+ *
+ */
+
+#ifndef DLEYNA_TASK_ATOM_H__
+#define DLEYNA_TASK_ATOM_H__
+
+typedef struct dleyna_task_queue_key_t_ dleyna_task_queue_key_t;
+
+struct dleyna_task_atom_t_ {
+	const dleyna_task_queue_key_t *queue_id;
+};
+typedef struct dleyna_task_atom_t_ dleyna_task_atom_t;
+
+#endif /* DLEYNA_TASK_ATOM_H__ */
diff --git a/src/task-processor.c b/src/task-processor.c
new file mode 100644
index 0000000..cb01f26
--- /dev/null
+++ b/src/task-processor.c
@@ -0,0 +1,491 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Regis Merlino <regis.merlino@intel.com>
+ *
+ */
+
+#include <stdlib.h>
+#include <string.h>
+
+#include "log.h"
+#include "task-processor.h"
+
+struct dleyna_task_processor_t_ {
+	GHashTable *task_queues;
+	guint running_tasks;
+	gboolean quitting;
+	GSourceFunc on_quit_cb;
+};
+
+struct dleyna_task_queue_t_ {
+	GPtrArray *tasks;
+	dleyna_task_process_cb_t task_process_cb;
+	dleyna_task_cancel_cb_t task_cancel_cb;
+	dleyna_task_delete_cb_t task_delete_cb;
+	dleyna_task_finally_cb_t task_queue_finally_cb;
+	dleyna_task_atom_t *current_task;
+	guint idle_id;
+	gboolean defer_remove;
+	guint32 flags;
+	gpointer user_data;
+	gboolean cancelled;
+};
+typedef struct dleyna_task_queue_t_ dleyna_task_queue_t;
+
+struct dleyna_task_queue_key_t_ {
+	dleyna_task_processor_t *processor;
+	gchar *source;
+	gchar *sink;
+};
+
+static guint prv_key_hash_cb(gconstpointer ptr)
+{
+	const dleyna_task_queue_key_t *queue_key = ptr;
+	guint hash;
+
+	hash = g_str_hash(queue_key->source);
+	hash ^= g_str_hash(queue_key->sink);
+
+	return hash;
+}
+
+static gboolean prv_key_equal_cb(gconstpointer ptr1, gconstpointer ptr2)
+{
+	const dleyna_task_queue_key_t *queue_key1 = ptr1;
+	const dleyna_task_queue_key_t *queue_key2 = ptr2;
+
+	return !strcmp(queue_key1->source, queue_key2->source) &&
+	       !strcmp(queue_key1->sink, queue_key2->sink);
+}
+
+static void prv_key_free_cb(gpointer ptr)
+{
+	dleyna_task_queue_key_t *queue_key = ptr;
+
+	g_free(queue_key->source);
+	g_free(queue_key->sink);
+	g_free(queue_key);
+}
+
+static void prv_task_free_cb(gpointer data, gpointer user_data)
+{
+	dleyna_task_queue_t *task_queue = user_data;
+
+	task_queue->task_delete_cb(data, task_queue->user_data);
+}
+
+static gboolean prv_finally_cb(gpointer data)
+{
+	dleyna_task_queue_t *task_queue = data;
+
+	task_queue->task_queue_finally_cb(task_queue->cancelled,
+					  task_queue->user_data);
+
+	g_free(task_queue);
+
+	return FALSE;
+}
+
+static void prv_free_cb(gpointer data)
+{
+	dleyna_task_queue_t *task_queue = data;
+
+	DLEYNA_LOG_DEBUG("Enter");
+
+	g_ptr_array_foreach(task_queue->tasks, prv_task_free_cb, task_queue);
+	g_ptr_array_unref(task_queue->tasks);
+
+	if (task_queue->task_queue_finally_cb)
+		g_idle_add(prv_finally_cb, task_queue);
+	else
+		g_free(task_queue);
+
+	DLEYNA_LOG_DEBUG("Exit");
+}
+
+dleyna_task_processor_t *dleyna_task_processor_new(GSourceFunc on_quit_cb)
+{
+	dleyna_task_processor_t *processor;
+
+	DLEYNA_LOG_DEBUG("Enter");
+
+	processor = g_malloc(sizeof(*processor));
+
+	processor->task_queues = g_hash_table_new_full(prv_key_hash_cb,
+						       prv_key_equal_cb,
+						       prv_key_free_cb,
+						       prv_free_cb);
+	processor->running_tasks = 0;
+	processor->quitting = FALSE;
+	processor->on_quit_cb = on_quit_cb;
+
+	DLEYNA_LOG_DEBUG("Exit");
+
+	return processor;
+}
+
+void dleyna_task_processor_free(dleyna_task_processor_t *processor)
+{
+	DLEYNA_LOG_DEBUG("Enter");
+
+	g_hash_table_unref(processor->task_queues);
+	g_free(processor);
+
+	DLEYNA_LOG_DEBUG("Exit");
+}
+
+const dleyna_task_queue_key_t *dleyna_task_processor_add_queue(
+				dleyna_task_processor_t *processor,
+				const gchar *source,
+				const gchar *sink,
+				guint32 flags,
+				dleyna_task_process_cb_t task_process_cb,
+				dleyna_task_cancel_cb_t task_cancel_cb,
+				dleyna_task_delete_cb_t task_delete_cb)
+{
+	dleyna_task_queue_t *queue;
+	dleyna_task_queue_key_t *key;
+
+	DLEYNA_LOG_DEBUG("Enter - queue <%s,%s>", source, sink);
+
+	key = g_malloc(sizeof(*key));
+	key->processor = processor;
+	key->source = g_strdup(source);
+	key->sink = g_strdup(sink);
+
+	queue = g_malloc0(sizeof(*queue));
+	queue->task_process_cb = task_process_cb;
+	queue->task_cancel_cb = task_cancel_cb;
+	queue->task_delete_cb = task_delete_cb;
+	queue->tasks = g_ptr_array_new();
+	queue->flags = flags;
+
+	g_hash_table_insert(processor->task_queues, key, queue);
+
+	DLEYNA_LOG_DEBUG("Exit");
+
+	return key;
+}
+
+static void prv_task_cancel_and_free_cb(gpointer data, gpointer user_data)
+{
+	dleyna_task_queue_t *task_queue = user_data;
+
+	task_queue->task_cancel_cb(data, task_queue->user_data);
+	task_queue->task_delete_cb(data, task_queue->user_data);
+}
+
+static void prv_cancel(const dleyna_task_queue_key_t *queue_id,
+				  dleyna_task_queue_t *task_queue)
+{
+	task_queue->cancelled = TRUE;
+
+	g_ptr_array_foreach(task_queue->tasks, prv_task_cancel_and_free_cb,
+			    task_queue);
+	g_ptr_array_set_size(task_queue->tasks, 0);
+
+	if (task_queue->idle_id) {
+		(void) g_source_remove(task_queue->idle_id);
+		task_queue->idle_id = 0;
+	}
+
+	if (task_queue->current_task) {
+		task_queue->task_cancel_cb(task_queue->current_task,
+					   task_queue->user_data);
+	} else if (task_queue->flags & DLEYNA_TASK_QUEUE_FLAG_AUTO_REMOVE) {
+		DLEYNA_LOG_DEBUG("Removing queue <%s,%s>",
+				 queue_id->source, queue_id->sink);
+		g_hash_table_remove(queue_id->processor->task_queues, queue_id);
+	}
+}
+
+static void prv_cancel_cb(gpointer key, gpointer value, gpointer user_data)
+{
+	dleyna_task_queue_key_t *queue_id = key;
+	dleyna_task_queue_t *task_queue = value;
+
+	prv_cancel(queue_id, task_queue);
+}
+
+static void prv_cancel_all_queues(dleyna_task_processor_t *processor)
+{
+	DLEYNA_LOG_DEBUG("Enter");
+
+	g_hash_table_foreach(processor->task_queues, prv_cancel_cb, NULL);
+
+	DLEYNA_LOG_DEBUG("Exit");
+}
+
+void dleyna_task_processor_set_quitting(dleyna_task_processor_t *processor)
+{
+	DLEYNA_LOG_DEBUG("Enter");
+
+	processor->quitting = TRUE;
+
+	if (processor->running_tasks > 0)
+		prv_cancel_all_queues(processor);
+	else
+		g_idle_add(processor->on_quit_cb, NULL);
+
+	DLEYNA_LOG_DEBUG("Exit");
+}
+
+void dleyna_task_processor_cancel_queue(const dleyna_task_queue_key_t *queue_id)
+{
+	dleyna_task_queue_t *queue;
+
+	DLEYNA_LOG_DEBUG("Cancel queue <%s,%s>", queue_id->source,
+			 queue_id->sink);
+
+	queue = g_hash_table_lookup(queue_id->processor->task_queues, queue_id);
+	prv_cancel(queue_id, queue);
+
+	DLEYNA_LOG_DEBUG("Exit");
+}
+
+static gboolean prv_free_queue_for_source(gpointer key, gpointer value,
+					  gpointer user_data)
+{
+	dleyna_task_queue_key_t *queue_key = key;
+	dleyna_task_queue_t *queue = value;
+	const gchar *source = user_data;
+	gboolean ret_val = FALSE;
+
+	if (!strcmp(source, queue_key->source) && !queue->defer_remove) {
+		queue->defer_remove = (queue->current_task != NULL);
+		prv_cancel(queue_key, queue);
+
+		if (!queue->defer_remove) {
+			DLEYNA_LOG_DEBUG("Removing queue <%s,%s>",
+					 queue_key->source, queue_key->sink);
+			ret_val = TRUE;
+		}
+	}
+
+	return ret_val;
+}
+
+void dleyna_task_processor_remove_queues_for_source(
+					dleyna_task_processor_t *processor,
+					const gchar *source)
+{
+	DLEYNA_LOG_DEBUG("Enter - Source <%s>", source);
+
+	g_hash_table_foreach_remove(processor->task_queues,
+				    prv_free_queue_for_source,
+				    (gpointer)source);
+
+	DLEYNA_LOG_DEBUG("Exit");
+}
+
+static gboolean prv_free_queue_for_sink(gpointer key, gpointer value,
+					gpointer user_data)
+{
+	dleyna_task_queue_key_t *queue_key = key;
+	dleyna_task_queue_t *queue = value;
+	const gchar *sink = user_data;
+	gboolean ret_val = FALSE;
+
+	if (!strcmp(sink, queue_key->sink) && !queue->defer_remove) {
+		queue->defer_remove = (queue->current_task != NULL);
+		prv_cancel(queue_key, queue);
+
+		if (!queue->defer_remove) {
+			DLEYNA_LOG_DEBUG("Removing queue <%s,%s>",
+					 queue_key->source, queue_key->sink);
+			ret_val = TRUE;
+		}
+	}
+
+	return ret_val;
+}
+
+void dleyna_task_processor_remove_queues_for_sink(
+					dleyna_task_processor_t *processor,
+					const gchar *sink)
+{
+	DLEYNA_LOG_DEBUG("Enter - Sink <%s>", sink);
+
+	g_hash_table_foreach_remove(processor->task_queues,
+				    prv_free_queue_for_sink,
+				    (gpointer)sink);
+
+	DLEYNA_LOG_DEBUG("Exit");
+}
+
+const dleyna_task_queue_key_t *dleyna_task_processor_lookup_queue(
+				const dleyna_task_processor_t *processor,
+				const gchar *source,
+				const gchar *sink)
+{
+	dleyna_task_queue_key_t key;
+	dleyna_task_queue_key_t *orig_key = NULL;
+	dleyna_task_queue_t *queue;
+
+	key.source = (gchar *)source;
+	key.sink = (gchar *)sink;
+
+	g_hash_table_lookup_extended(processor->task_queues,
+				     &key,
+				     (gpointer *)&orig_key,
+				     (gpointer *)&queue);
+
+	return orig_key;
+}
+
+static gboolean prv_process_task(gpointer user_data)
+{
+	dleyna_task_queue_key_t *queue_id = user_data;
+	dleyna_task_queue_t *queue;
+
+	DLEYNA_LOG_DEBUG("Enter - Start task processing for queue <%s,%s>",
+			 queue_id->source, queue_id->sink);
+
+	queue = g_hash_table_lookup(queue_id->processor->task_queues, queue_id);
+
+	queue->cancelled = FALSE;
+	queue->idle_id = 0;
+	queue->current_task = g_ptr_array_index(queue->tasks, 0);
+	g_ptr_array_remove_index(queue->tasks, 0);
+	queue_id->processor->running_tasks++;
+	queue->task_process_cb(queue->current_task, queue->user_data);
+
+	DLEYNA_LOG_DEBUG("Exit");
+
+	return FALSE;
+}
+
+void dleyna_task_queue_start(const dleyna_task_queue_key_t *queue_id)
+{
+	dleyna_task_queue_t *queue;
+
+	DLEYNA_LOG_DEBUG("Enter - Starting queue <%s,%s>", queue_id->source,
+			 queue_id->sink);
+
+	queue = g_hash_table_lookup(queue_id->processor->task_queues, queue_id);
+
+	if (queue->defer_remove)
+		goto exit;
+
+	if (!queue->current_task && !queue->idle_id)
+		queue->idle_id = g_idle_add(prv_process_task,
+					    (gpointer)queue_id);
+
+exit:
+	DLEYNA_LOG_DEBUG("Exit");
+}
+
+void dleyna_task_queue_add_task(const dleyna_task_queue_key_t *queue_id,
+				dleyna_task_atom_t *task)
+{
+	dleyna_task_queue_t *queue;
+
+	DLEYNA_LOG_DEBUG("Enter - Task added to queue <%s,%s>",
+			 queue_id->source, queue_id->sink);
+
+	queue = g_hash_table_lookup(queue_id->processor->task_queues, queue_id);
+
+	task->queue_id = queue_id;
+	g_ptr_array_add(queue->tasks, task);
+
+	if (queue->defer_remove)
+		goto exit;
+
+	if ((queue->flags & DLEYNA_TASK_QUEUE_FLAG_AUTO_START) &&
+	    (!queue->current_task && !queue->idle_id))
+		queue->idle_id = g_idle_add(prv_process_task,
+					    (gpointer)queue_id);
+
+exit:
+	DLEYNA_LOG_DEBUG("Exit");
+}
+
+void dleyna_task_queue_task_completed(const dleyna_task_queue_key_t *queue_id)
+{
+	dleyna_task_queue_t *queue;
+	dleyna_task_processor_t *processor = queue_id->processor;
+
+	DLEYNA_LOG_DEBUG("Enter - Task completed for queue <%s,%s>",
+			 queue_id->source, queue_id->sink);
+
+	queue = g_hash_table_lookup(processor->task_queues, queue_id);
+
+	if (queue->current_task) {
+		queue->task_delete_cb(queue->current_task, queue->user_data);
+		queue->current_task = NULL;
+	}
+
+	processor->running_tasks--;
+
+	if (processor->quitting && !processor->running_tasks) {
+		g_idle_add(processor->on_quit_cb, NULL);
+	} else if (queue->defer_remove) {
+		DLEYNA_LOG_DEBUG("Removing queue <%s,%s>",
+				 queue_id->source, queue_id->sink);
+		g_hash_table_remove(processor->task_queues, queue_id);
+	} else if (queue->tasks->len > 0) {
+		queue->idle_id = g_idle_add(prv_process_task,
+					    (gpointer)queue_id);
+	} else if (queue->flags & DLEYNA_TASK_QUEUE_FLAG_AUTO_REMOVE) {
+		DLEYNA_LOG_DEBUG("Removing queue <%s,%s>",
+				 queue_id->source, queue_id->sink);
+		g_hash_table_remove(processor->task_queues, queue_id);
+	}
+
+	DLEYNA_LOG_DEBUG("Exit");
+}
+
+void dleyna_task_queue_set_finally(const dleyna_task_queue_key_t *queue_id,
+				   dleyna_task_finally_cb_t finally_cb)
+{
+	dleyna_task_queue_t *queue;
+	dleyna_task_processor_t *processor = queue_id->processor;
+
+	queue = g_hash_table_lookup(processor->task_queues, queue_id);
+
+	queue->task_queue_finally_cb = finally_cb;
+}
+
+void dleyna_task_queue_set_user_data(const dleyna_task_queue_key_t *queue_id,
+				     gpointer user_data)
+{
+	dleyna_task_queue_t *queue;
+	dleyna_task_processor_t *processor = queue_id->processor;
+
+	queue = g_hash_table_lookup(processor->task_queues, queue_id);
+
+	queue->user_data = user_data;
+}
+
+gpointer dleyna_task_queue_get_user_data(
+					const dleyna_task_queue_key_t *queue_id)
+{
+	dleyna_task_queue_t *queue;
+	dleyna_task_processor_t *processor = queue_id->processor;
+
+	queue = g_hash_table_lookup(processor->task_queues, queue_id);
+
+	return queue->user_data;
+}
+
+const gchar *dleyna_task_queue_get_source(
+					const dleyna_task_queue_key_t *queue_id)
+{
+	return queue_id->source;
+}
diff --git a/src/task-processor.h b/src/task-processor.h
new file mode 100644
index 0000000..ac0b6f4
--- /dev/null
+++ b/src/task-processor.h
@@ -0,0 +1,102 @@
+/*
+ * dLeyna
+ *
+ * Copyright (C) 2012-2013 Intel Corporation. All rights reserved.
+ *
+ * This program is free software; you can redistribute it and/or modify it
+ * under the terms and conditions of the GNU Lesser General Public License,
+ * version 2.1, as published by the Free Software Foundation.
+ *
+ * This program is distributed in the hope it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+ * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU Lesser General Public License
+ * for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public License
+ * along with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin St - Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ * Regis Merlino <regis.merlino@intel.com>
+ *
+ */
+
+#ifndef DLEYNA_TASK_PROCESSOR_H__
+#define DLEYNA_TASK_PROCESSOR_H__
+
+#include <gio/gio.h>
+#include <glib.h>
+
+#include "task-atom.h"
+
+enum dleyna_task_queue_flag_mask_ {
+	DLEYNA_TASK_QUEUE_FLAG_NONE = 0,
+	DLEYNA_TASK_QUEUE_FLAG_AUTO_START = 1,
+	DLEYNA_TASK_QUEUE_FLAG_AUTO_REMOVE = 1 << 1,
+};
+typedef enum dleyna_task_queue_flag_mask_ dleyna_task_queue_flag_mask;
+
+typedef struct dleyna_task_processor_t_ dleyna_task_processor_t;
+
+typedef void (*dleyna_task_process_cb_t)(dleyna_task_atom_t *task,
+					 gpointer user_data);
+
+typedef void (*dleyna_task_cancel_cb_t)(dleyna_task_atom_t *task,
+					gpointer user_data);
+
+typedef void (*dleyna_task_delete_cb_t)(dleyna_task_atom_t *task,
+					gpointer user_data);
+
+typedef void (*dleyna_task_finally_cb_t)(gboolean cancelled,
+					 gpointer user_data);
+
+dleyna_task_processor_t *dleyna_task_processor_new(GSourceFunc on_quit_cb);
+
+void dleyna_task_processor_free(dleyna_task_processor_t *processor);
+
+void dleyna_task_processor_set_quitting(dleyna_task_processor_t *processor);
+
+const dleyna_task_queue_key_t *dleyna_task_processor_add_queue(
+				dleyna_task_processor_t *processor,
+				const gchar *source,
+				const gchar *sink,
+				guint32 flags,
+				dleyna_task_process_cb_t task_process_cb,
+				dleyna_task_cancel_cb_t task_cancel_cb,
+				dleyna_task_delete_cb_t task_delete_cb);
+
+const dleyna_task_queue_key_t *dleyna_task_processor_lookup_queue(
+				const dleyna_task_processor_t *processor,
+				const gchar *source,
+				const gchar *sink);
+
+void dleyna_task_processor_cancel_queue(
+				const dleyna_task_queue_key_t *queue_id);
+
+void dleyna_task_processor_remove_queues_for_source(
+					dleyna_task_processor_t *processor,
+					const gchar *source);
+
+void dleyna_task_processor_remove_queues_for_sink(
+					dleyna_task_processor_t *processor,
+					const gchar *sink);
+
+void dleyna_task_queue_start(const dleyna_task_queue_key_t *queue_id);
+
+void dleyna_task_queue_add_task(const dleyna_task_queue_key_t *queue_id,
+			     dleyna_task_atom_t *task);
+
+void dleyna_task_queue_task_completed(const dleyna_task_queue_key_t *queue_id);
+
+void dleyna_task_queue_set_finally(const dleyna_task_queue_key_t *queue_id,
+				   dleyna_task_finally_cb_t finally_cb);
+
+void dleyna_task_queue_set_user_data(const dleyna_task_queue_key_t *queue_id,
+				     gpointer user_data);
+
+gpointer dleyna_task_queue_get_user_data(
+				const dleyna_task_queue_key_t *queue_id);
+
+const gchar *dleyna_task_queue_get_source(
+				const dleyna_task_queue_key_t *queue_id);
+
+#endif /* DLEYNA_TASK_PROCESSOR_H__ */