v0.4.1

# By Michelle Bergeron
# Via Michelle Bergeron
* 'master' of github.com:limelight-stream/limelight-ios:
  Update README.md

.gitignore

@@ -1 +1,2 @@
-Limelight.xcodeproj/xcuserdata/
+**/xcuserdata/
+Build

LICENSE.txt

@@ -0,0 +1,674 @@
+                    GNU GENERAL PUBLIC LICENSE
+                       Version 3, 29 June 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU General Public License is a free, copyleft license for
+software and other kinds of works.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+the GNU General Public License is intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.  We, the Free Software Foundation, use the
+GNU General Public License for most of our software; it applies also to
+any other work released this way by its authors.  You can apply it to
+your programs, too.
+
+  When we speak of free software, we are referring to freedom, 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
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  To protect your rights, we need to prevent others from denying you
+these rights or asking you to surrender the rights.  Therefore, you have
+certain responsibilities if you distribute copies of the software, or if
+you modify it: responsibilities to respect the freedom of others.
+
+  For example, if you distribute copies of such a program, whether
+gratis or for a fee, you must pass on to the recipients the same
+freedoms that you received.  You must make sure that they, too, receive
+or can get the source code.  And you must show them these terms so they
+know their rights.
+
+  Developers that use the GNU GPL protect your rights with two steps:
+(1) assert copyright on the software, and (2) offer you this License
+giving you legal permission to copy, distribute and/or modify it.
+
+  For the developers' and authors' protection, the GPL clearly explains
+that there is no warranty for this free software.  For both users' and
+authors' sake, the GPL requires that modified versions be marked as
+changed, so that their problems will not be attributed erroneously to
+authors of previous versions.
+
+  Some devices are designed to deny users access to install or run
+modified versions of the software inside them, although the manufacturer
+can do so.  This is fundamentally incompatible with the aim of
+protecting users' freedom to change the software.  The systematic
+pattern of such abuse occurs in the area of products for individuals to
+use, which is precisely where it is most unacceptable.  Therefore, we
+have designed this version of the GPL to prohibit the practice for those
+products.  If such problems arise substantially in other domains, we
+stand ready to extend this provision to those domains in future versions
+of the GPL, as needed to protect the freedom of users.
+
+  Finally, every program is threatened constantly by software patents.
+States should not allow patents to restrict development and use of
+software on general-purpose computers, but in those that do, we wish to
+avoid the special danger that patents applied to a free program could
+make it effectively proprietary.  To prevent this, the GPL assures that
+patents cannot be used to render the program non-free.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If 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 convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Use with the GNU Affero General Public License.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU Affero General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the special requirements of the GNU Affero General Public License,
+section 13, concerning interaction through a network will apply to the
+combination as such.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU 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
+Program specifies that a certain numbered version of the GNU General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "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 PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM 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 PROGRAM (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 PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state 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 program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with this program.  If not, see <http://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If the program does terminal interaction, make it output a short
+notice like this when it starts in an interactive mode:
+
+    <program>  Copyright (C) <year>  <name of author>
+    This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
+    This is free software, and you are welcome to redistribute it
+    under certain conditions; type `show c' for details.
+
+The hypothetical commands `show w' and `show c' should show the appropriate
+parts of the General Public License.  Of course, your program's commands
+might be different; for a GUI interface, you would use an "about box".
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU GPL, see
+<http://www.gnu.org/licenses/>.
+
+  The GNU General Public License does not permit incorporating your program
+into proprietary programs.  If your program is a subroutine library, you
+may consider it more useful to permit linking proprietary applications with
+the library.  If this is what you want to do, use the GNU Lesser General
+Public License instead of this License.  But first, please read
+<http://www.gnu.org/philosophy/why-not-lgpl.html>.

Launch Screen.xib

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="6254" systemVersion="14C81f" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" launchScreen="YES" useTraitCollections="YES">
     <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
     </dependencies>
     <objects>
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
@@ -13,26 +13,22 @@
                 <label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="  Copyright (c) 2014 Limelight Stream. All rights reserved." textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" minimumFontSize="9" translatesAutoresizingMaskIntoConstraints="NO" id="8ie-xW-0ye">
                     <rect key="frame" x="22" y="439" width="437" height="21"/>
                     <fontDescription key="fontDescription" type="system" pointSize="17"/>
-                    <color key="textColor" red="0.6705882352941176" green="0.83137254901960789" blue="0.086274509803921567" alpha="1" colorSpace="calibratedRGB"/>
+                    <color key="textColor" red="0.070588235294117646" green="0.45490196078431372" blue="0.074509803921568626" alpha="1" colorSpace="calibratedRGB"/>
                     <nil key="highlightedColor"/>
                     <variation key="widthClass=compact">
                         <fontDescription key="fontDescription" type="system" pointSize="11"/>
                     </variation>
                 </label>
-                <imageView userInteractionEnabled="NO" contentMode="scaleAspectFit" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="store_icon_1024x1024" translatesAutoresizingMaskIntoConstraints="NO" id="tIx-KE-YER">
-                    <rect key="frame" x="127" y="126" width="227" height="227"/>
-                    <constraints>
-                        <constraint firstAttribute="width" constant="227" id="EI7-Sf-3cH"/>
-                        <constraint firstAttribute="height" constant="227" id="b0G-y9-aP0"/>
-                    </constraints>
+                <imageView userInteractionEnabled="NO" contentMode="scaleToFill" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="Limelight Flat Design Banner" translatesAutoresizingMaskIntoConstraints="NO" id="lr8-1h-ydW">
+                    <rect key="frame" x="-8" y="115" width="496" height="251"/>
                 </imageView>
             </subviews>
             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
             <constraints>
-                <constraint firstItem="tIx-KE-YER" firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="GN9-Xb-RLD"/>
+                <constraint firstAttribute="centerY" secondItem="lr8-1h-ydW" secondAttribute="centerY" id="C8A-9E-cM6"/>
                 <constraint firstAttribute="bottom" secondItem="8ie-xW-0ye" secondAttribute="bottom" constant="20" id="Gnz-uJ-CDw"/>
+                <constraint firstAttribute="centerX" secondItem="lr8-1h-ydW" secondAttribute="centerX" id="WCv-Cd-TyR"/>
                 <constraint firstAttribute="centerX" secondItem="8ie-xW-0ye" secondAttribute="centerX" id="ZEH-qu-HZ9"/>
-                <constraint firstAttribute="centerY" secondItem="tIx-KE-YER" secondAttribute="centerY" constant="0.5" id="trN-ZP-0Hg"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <freeformSimulatedSizeMetrics key="simulatedDestinationMetrics"/>
@@ -40,6 +36,6 @@
         </view>
     </objects>
     <resources>
-        <image name="store_icon_1024x1024" width="1024" height="1024"/>
+        <image name="Limelight Flat Design Banner" width="496" height="251"/>
     </resources>
 </document>

Limelight.xcodeproj/project.pbxproj

@@ -8,6 +8,13 @@
 
 /* Begin PBXBuildFile section */
 		98A03B4D19F352EB00861ACA /* liblimelight-common.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 98A03B4A19F3514B00861ACA /* liblimelight-common.a */; };
+		9E5D600B1A5A5A3900689918 /* Apache License.txt in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FF81A5A5A3900689918 /* Apache License.txt */; };
+		9E5D600C1A5A5A3900689918 /* Roboto-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FF91A5A5A3900689918 /* Roboto-Black.ttf */; };
+		9E5D600E1A5A5A3900689918 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FFB1A5A5A3900689918 /* Roboto-Bold.ttf */; };
+		9E5D60111A5A5A3900689918 /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D5FFE1A5A5A3900689918 /* Roboto-Light.ttf */; };
+		9E5D60131A5A5A3900689918 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D60001A5A5A3900689918 /* Roboto-Medium.ttf */; };
+		9E5D60151A5A5A3900689918 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D60021A5A5A3900689918 /* Roboto-Regular.ttf */; };
+		9E5D60161A5A5A3900689918 /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 9E5D60031A5A5A3900689918 /* Roboto-Thin.ttf */; };
 		FB290CF219B2C406004C83CF /* Foundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290CF119B2C406004C83CF /* Foundation.framework */; };
 		FB290CF419B2C406004C83CF /* CoreGraphics.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290CF319B2C406004C83CF /* CoreGraphics.framework */; };
 		FB290CF619B2C406004C83CF /* UIKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290CF519B2C406004C83CF /* UIKit.framework */; };
@@ -25,8 +32,14 @@
 		FB290DB719B2C870004C83CF /* libz.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290DB619B2C870004C83CF /* libz.dylib */; };
 		FB290DB919B2C877004C83CF /* libbz2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290DB819B2C877004C83CF /* libbz2.dylib */; };
 		FB290DC419B2E98F004C83CF /* libxml2.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FB290DC319B2E98F004C83CF /* libxml2.dylib */; };
-		FB290E7919B37D81004C83CF /* MainFrame-iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FB290E7819B37D81004C83CF /* MainFrame-iPad.storyboard */; };
-		FB290E7B19B38036004C83CF /* MainFrame-iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FB290E7A19B38036004C83CF /* MainFrame-iPhone.storyboard */; };
+		FB290E7919B37D81004C83CF /* iPad.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FB290E7819B37D81004C83CF /* iPad.storyboard */; };
+		FB290E7B19B38036004C83CF /* iPhone.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = FB290E7A19B38036004C83CF /* iPhone.storyboard */; };
+		FB4678ED1A50C40900377732 /* OnScreenControls.m in Sources */ = {isa = PBXBuildFile; fileRef = FB4678EC1A50C40900377732 /* OnScreenControls.m */; };
+		FB4678FA1A55FFAD00377732 /* DiscoveryManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FB4678F91A55FFAD00377732 /* DiscoveryManager.m */; };
+		FB4678FF1A565DAC00377732 /* WakeOnLanManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FB4678FE1A565DAC00377732 /* WakeOnLanManager.m */; };
+		FB4679011A57048000377732 /* CoreFoundation.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = FB4679001A57048000377732 /* CoreFoundation.framework */; };
+		FB4A23B81A9D3637004D2EF2 /* LoadingFrameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FB4A23B71A9D3637004D2EF2 /* LoadingFrameViewController.m */; };
+		FB6549561A57907E001C8F39 /* DiscoveryWorker.m in Sources */ = {isa = PBXBuildFile; fileRef = FB6549551A57907E001C8F39 /* DiscoveryWorker.m */; };
 		FB7E794419C8B71B00A15F68 /* libiconv.dylib in Frameworks */ = {isa = PBXBuildFile; fileRef = FB7E794319C8B71B00A15F68 /* libiconv.dylib */; };
 		FB89462819F646E200339C8A /* CryptoManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89460619F646E200339C8A /* CryptoManager.m */; };
 		FB89462919F646E200339C8A /* mkcert.c in Sources */ = {isa = PBXBuildFile; fileRef = FB89460719F646E200339C8A /* mkcert.c */; };
@@ -39,7 +52,6 @@
 		FB89463019F646E200339C8A /* StreamConfiguration.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89461919F646E200339C8A /* StreamConfiguration.m */; };
 		FB89463119F646E200339C8A /* StreamManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89461B19F646E200339C8A /* StreamManager.m */; };
 		FB89463219F646E200339C8A /* VideoDecoderRenderer.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89461D19F646E200339C8A /* VideoDecoderRenderer.m */; };
-		FB89463319F646E200339C8A /* Computer.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89462019F646E200339C8A /* Computer.m */; };
 		FB89463419F646E200339C8A /* Utils.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89462219F646E200339C8A /* Utils.m */; };
 		FB89463519F646E200339C8A /* MainFrameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89462519F646E200339C8A /* MainFrameViewController.m */; };
 		FB89463619F646E200339C8A /* StreamFrameViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FB89462719F646E200339C8A /* StreamFrameViewController.m */; };
@@ -47,6 +59,23 @@
 		FB8946EB19F6AFE100339C8A /* libcrypto.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8946E019F6AFB800339C8A /* libcrypto.a */; };
 		FB8946EC19F6AFE400339C8A /* libssl.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8946E119F6AFB800339C8A /* libssl.a */; };
 		FB8946ED19F6AFE800339C8A /* libopus.a in Frameworks */ = {isa = PBXBuildFile; fileRef = FB8946EA19F6AFB800339C8A /* libopus.a */; };
+		FB9AFD281A7C84ED00872C98 /* HttpResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD271A7C84ED00872C98 /* HttpResponse.m */; };
+		FB9AFD321A7D867C00872C98 /* AppAssetRetriever.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD311A7D867C00872C98 /* AppAssetRetriever.m */; };
+		FB9AFD371A7E02DB00872C98 /* HttpRequest.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD361A7E02DB00872C98 /* HttpRequest.m */; };
+		FB9AFD3A1A7E05CE00872C98 /* ServerInfoResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD391A7E05CE00872C98 /* ServerInfoResponse.m */; };
+		FB9AFD3D1A7E111600872C98 /* AppAssetResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD3C1A7E111600872C98 /* AppAssetResponse.m */; };
+		FB9AFD401A7E127D00872C98 /* AppListResponse.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD3F1A7E127D00872C98 /* AppListResponse.m */; };
+		FB9AFD431A7F0C6900872C98 /* Controller.m in Sources */ = {isa = PBXBuildFile; fileRef = FB9AFD421A7F0C6900872C98 /* Controller.m */; };
+		FBD1C8E21A8AD71400C6703C /* Logger.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD1C8E11A8AD71400C6703C /* Logger.m */; };
+		FBD3494319FC9C04002D2A60 /* AppAssetManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3494219FC9C04002D2A60 /* AppAssetManager.m */; };
+		FBD3495019FF2174002D2A60 /* SettingsViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3494F19FF2174002D2A60 /* SettingsViewController.m */; };
+		FBD3495319FF36FB002D2A60 /* SWRevealViewController.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3495219FF36FB002D2A60 /* SWRevealViewController.m */; };
+		FBD3495B1A004411002D2A60 /* Host.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3495A1A004411002D2A60 /* Host.m */; };
+		FBD3495E1A004412002D2A60 /* Settings.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3495D1A004412002D2A60 /* Settings.m */; };
+		FBD349621A0089F6002D2A60 /* DataManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD349611A0089F6002D2A60 /* DataManager.m */; };
+		FBDE86E019F7A837001C18A8 /* UIComputerView.m in Sources */ = {isa = PBXBuildFile; fileRef = FBDE86DF19F7A837001C18A8 /* UIComputerView.m */; };
+		FBDE86E619F82297001C18A8 /* UIAppView.m in Sources */ = {isa = PBXBuildFile; fileRef = FBDE86E519F82297001C18A8 /* UIAppView.m */; };
+		FBDE86E919F82315001C18A8 /* App.m in Sources */ = {isa = PBXBuildFile; fileRef = FBDE86E819F82315001C18A8 /* App.m */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -75,6 +104,13 @@
 
 /* Begin PBXFileReference section */
 		98A03B4519F3514B00861ACA /* limelight-common.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = "limelight-common.xcodeproj"; path = "limelight-common-c/limelight-common.xcodeproj"; sourceTree = "<group>"; };
+		9E5D5FF81A5A5A3900689918 /* Apache License.txt */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = "Apache License.txt"; sourceTree = "<group>"; };
+		9E5D5FF91A5A5A3900689918 /* Roboto-Black.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Black.ttf"; sourceTree = "<group>"; };
+		9E5D5FFB1A5A5A3900689918 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Bold.ttf"; sourceTree = "<group>"; };
+		9E5D5FFE1A5A5A3900689918 /* Roboto-Light.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Light.ttf"; sourceTree = "<group>"; };
+		9E5D60001A5A5A3900689918 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Medium.ttf"; sourceTree = "<group>"; };
+		9E5D60021A5A5A3900689918 /* Roboto-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Regular.ttf"; sourceTree = "<group>"; };
+		9E5D60031A5A5A3900689918 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; path = "Roboto-Thin.ttf"; sourceTree = "<group>"; };
 		FB290CEE19B2C406004C83CF /* Limelight.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Limelight.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		FB290CF119B2C406004C83CF /* Foundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Foundation.framework; path = System/Library/Frameworks/Foundation.framework; sourceTree = SDKROOT; };
 		FB290CF319B2C406004C83CF /* CoreGraphics.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreGraphics.framework; path = System/Library/Frameworks/CoreGraphics.framework; sourceTree = SDKROOT; };
@@ -95,8 +131,21 @@
 		FB290DB619B2C870004C83CF /* libz.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libz.dylib; path = usr/lib/libz.dylib; sourceTree = SDKROOT; };
 		FB290DB819B2C877004C83CF /* libbz2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libbz2.dylib; path = usr/lib/libbz2.dylib; sourceTree = SDKROOT; };
 		FB290DC319B2E98F004C83CF /* libxml2.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libxml2.dylib; path = usr/lib/libxml2.dylib; sourceTree = SDKROOT; };
-		FB290E7819B37D81004C83CF /* MainFrame-iPad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "MainFrame-iPad.storyboard"; sourceTree = SOURCE_ROOT; };
-		FB290E7A19B38036004C83CF /* MainFrame-iPhone.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = "MainFrame-iPhone.storyboard"; sourceTree = SOURCE_ROOT; };
+		FB290E7819B37D81004C83CF /* iPad.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = iPad.storyboard; sourceTree = SOURCE_ROOT; };
+		FB290E7A19B38036004C83CF /* iPhone.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; path = iPhone.storyboard; sourceTree = SOURCE_ROOT; };
+		FB4678EB1A50C40900377732 /* OnScreenControls.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = OnScreenControls.h; sourceTree = "<group>"; };
+		FB4678EC1A50C40900377732 /* OnScreenControls.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = OnScreenControls.m; sourceTree = "<group>"; };
+		FB4678F21A51BDCB00377732 /* Limelight 0.3.0.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Limelight 0.3.0.xcdatamodel"; sourceTree = "<group>"; };
+		FB4678F81A55FFAD00377732 /* DiscoveryManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiscoveryManager.h; sourceTree = "<group>"; };
+		FB4678F91A55FFAD00377732 /* DiscoveryManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DiscoveryManager.m; sourceTree = "<group>"; };
+		FB4678FD1A565DAC00377732 /* WakeOnLanManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = WakeOnLanManager.h; sourceTree = "<group>"; };
+		FB4678FE1A565DAC00377732 /* WakeOnLanManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = WakeOnLanManager.m; sourceTree = "<group>"; };
+		FB4679001A57048000377732 /* CoreFoundation.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = CoreFoundation.framework; path = System/Library/Frameworks/CoreFoundation.framework; sourceTree = SDKROOT; };
+		FB4A23B61A9D3637004D2EF2 /* LoadingFrameViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = LoadingFrameViewController.h; sourceTree = "<group>"; };
+		FB4A23B71A9D3637004D2EF2 /* LoadingFrameViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = LoadingFrameViewController.m; sourceTree = "<group>"; };
+		FB6549541A57907E001C8F39 /* DiscoveryWorker.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = DiscoveryWorker.h; sourceTree = "<group>"; };
+		FB6549551A57907E001C8F39 /* DiscoveryWorker.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = DiscoveryWorker.m; sourceTree = "<group>"; };
+		FB6549621A60B4A9001C8F39 /* Limelight 0.3.1.xcdatamodel */ = {isa = PBXFileReference; lastKnownFileType = wrapper.xcdatamodel; path = "Limelight 0.3.1.xcdatamodel"; sourceTree = "<group>"; };
 		FB7E794319C8B71B00A15F68 /* libiconv.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libiconv.dylib; path = usr/lib/libiconv.dylib; sourceTree = SDKROOT; };
 		FB89460519F646E200339C8A /* CryptoManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = CryptoManager.h; sourceTree = "<group>"; };
 		FB89460619F646E200339C8A /* CryptoManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = CryptoManager.m; sourceTree = "<group>"; };
@@ -120,8 +169,6 @@
 		FB89461B19F646E200339C8A /* StreamManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = StreamManager.m; sourceTree = "<group>"; };
 		FB89461C19F646E200339C8A /* VideoDecoderRenderer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = VideoDecoderRenderer.h; sourceTree = "<group>"; };
 		FB89461D19F646E200339C8A /* VideoDecoderRenderer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = VideoDecoderRenderer.m; sourceTree = "<group>"; };
-		FB89461F19F646E200339C8A /* Computer.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Computer.h; sourceTree = "<group>"; };
-		FB89462019F646E200339C8A /* Computer.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Computer.m; sourceTree = "<group>"; };
 		FB89462119F646E200339C8A /* Utils.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Utils.h; sourceTree = "<group>"; };
 		FB89462219F646E200339C8A /* Utils.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Utils.m; sourceTree = "<group>"; };
 		FB89462419F646E200339C8A /* MainFrameViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = MainFrameViewController.h; sourceTree = "<group>"; };
@@ -211,6 +258,41 @@
 		FB8946E719F6AFB800339C8A /* opus_multistream.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = opus_multistream.h; sourceTree = "<group>"; };
 		FB8946E819F6AFB800339C8A /* opus_types.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = opus_types.h; sourceTree = "<group>"; };
 		FB8946EA19F6AFB800339C8A /* libopus.a */ = {isa = PBXFileReference; lastKnownFileType = archive.ar; path = libopus.a; sourceTree = "<group>"; };
+		FB9AFD261A7C84ED00872C98 /* HttpResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpResponse.h; sourceTree = "<group>"; };
+		FB9AFD271A7C84ED00872C98 /* HttpResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpResponse.m; sourceTree = "<group>"; };
+		FB9AFD301A7D867C00872C98 /* AppAssetRetriever.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppAssetRetriever.h; sourceTree = "<group>"; };
+		FB9AFD311A7D867C00872C98 /* AppAssetRetriever.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppAssetRetriever.m; sourceTree = "<group>"; };
+		FB9AFD351A7E02DB00872C98 /* HttpRequest.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = HttpRequest.h; sourceTree = "<group>"; };
+		FB9AFD361A7E02DB00872C98 /* HttpRequest.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = HttpRequest.m; sourceTree = "<group>"; };
+		FB9AFD381A7E05CE00872C98 /* ServerInfoResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = ServerInfoResponse.h; sourceTree = "<group>"; };
+		FB9AFD391A7E05CE00872C98 /* ServerInfoResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = ServerInfoResponse.m; sourceTree = "<group>"; };
+		FB9AFD3B1A7E111600872C98 /* AppAssetResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppAssetResponse.h; sourceTree = "<group>"; };
+		FB9AFD3C1A7E111600872C98 /* AppAssetResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppAssetResponse.m; sourceTree = "<group>"; };
+		FB9AFD3E1A7E127D00872C98 /* AppListResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppListResponse.h; sourceTree = "<group>"; };
+		FB9AFD3F1A7E127D00872C98 /* AppListResponse.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppListResponse.m; sourceTree = "<group>"; };
+		FB9AFD411A7F0C6900872C98 /* Controller.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Controller.h; sourceTree = "<group>"; };
+		FB9AFD421A7F0C6900872C98 /* Controller.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Controller.m; sourceTree = "<group>"; };
+		FBD1C8E01A8AD69E00C6703C /* Logger.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = Logger.h; sourceTree = "<group>"; };
+		FBD1C8E11A8AD71400C6703C /* Logger.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = Logger.m; sourceTree = "<group>"; };
+		FBD3494119FC9C04002D2A60 /* AppAssetManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppAssetManager.h; sourceTree = "<group>"; };
+		FBD3494219FC9C04002D2A60 /* AppAssetManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppAssetManager.m; sourceTree = "<group>"; };
+		FBD3494E19FF2174002D2A60 /* SettingsViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SettingsViewController.h; sourceTree = "<group>"; };
+		FBD3494F19FF2174002D2A60 /* SettingsViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SettingsViewController.m; sourceTree = "<group>"; };
+		FBD3495119FF36FB002D2A60 /* SWRevealViewController.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SWRevealViewController.h; sourceTree = "<group>"; };
+		FBD3495219FF36FB002D2A60 /* SWRevealViewController.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SWRevealViewController.m; sourceTree = "<group>"; };
+		FBD349571A003F05002D2A60 /* libsqlite3.dylib */ = {isa = PBXFileReference; lastKnownFileType = "compiled.mach-o.dylib"; name = libsqlite3.dylib; path = usr/lib/libsqlite3.dylib; sourceTree = SDKROOT; };
+		FBD349591A004411002D2A60 /* Host.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Host.h; path = Database/Host.h; sourceTree = "<group>"; };
+		FBD3495A1A004411002D2A60 /* Host.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Host.m; path = Database/Host.m; sourceTree = "<group>"; };
+		FBD3495C1A004412002D2A60 /* Settings.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = Settings.h; path = Database/Settings.h; sourceTree = "<group>"; };
+		FBD3495D1A004412002D2A60 /* Settings.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = Settings.m; path = Database/Settings.m; sourceTree = "<group>"; };
+		FBD349601A0089F6002D2A60 /* DataManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = DataManager.h; path = Database/DataManager.h; sourceTree = "<group>"; };
+		FBD349611A0089F6002D2A60 /* DataManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = DataManager.m; path = Database/DataManager.m; sourceTree = "<group>"; };
+		FBDE86DE19F7A837001C18A8 /* UIComputerView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIComputerView.h; sourceTree = "<group>"; };
+		FBDE86DF19F7A837001C18A8 /* UIComputerView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIComputerView.m; sourceTree = "<group>"; };
+		FBDE86E419F82297001C18A8 /* UIAppView.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = UIAppView.h; sourceTree = "<group>"; };
+		FBDE86E519F82297001C18A8 /* UIAppView.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = UIAppView.m; sourceTree = "<group>"; };
+		FBDE86E719F82315001C18A8 /* App.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = App.h; path = ../App.h; sourceTree = "<group>"; };
+		FBDE86E819F82315001C18A8 /* App.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = App.m; path = ../App.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -230,6 +312,7 @@
 				FB290CF819B2C406004C83CF /* CoreData.framework in Frameworks */,
 				FB290CF619B2C406004C83CF /* UIKit.framework in Frameworks */,
 				FB290CF219B2C406004C83CF /* Foundation.framework in Frameworks */,
+				FB4679011A57048000377732 /* CoreFoundation.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -254,6 +337,28 @@
 			name = Products;
 			sourceTree = "<group>";
 		};
+		9E5D5FF61A5A5A3900689918 /* Font */ = {
+			isa = PBXGroup;
+			children = (
+				9E5D5FF71A5A5A3900689918 /* Roboto */,
+			);
+			path = Font;
+			sourceTree = "<group>";
+		};
+		9E5D5FF71A5A5A3900689918 /* Roboto */ = {
+			isa = PBXGroup;
+			children = (
+				9E5D5FF81A5A5A3900689918 /* Apache License.txt */,
+				9E5D5FF91A5A5A3900689918 /* Roboto-Black.ttf */,
+				9E5D5FFB1A5A5A3900689918 /* Roboto-Bold.ttf */,
+				9E5D5FFE1A5A5A3900689918 /* Roboto-Light.ttf */,
+				9E5D60001A5A5A3900689918 /* Roboto-Medium.ttf */,
+				9E5D60021A5A5A3900689918 /* Roboto-Regular.ttf */,
+				9E5D60031A5A5A3900689918 /* Roboto-Thin.ttf */,
+			);
+			path = Roboto;
+			sourceTree = "<group>";
+		};
 		FB290CE519B2C406004C83CF = {
 			isa = PBXGroup;
 			children = (
@@ -277,6 +382,8 @@
 		FB290CF019B2C406004C83CF /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				FB4679001A57048000377732 /* CoreFoundation.framework */,
+				FBD349571A003F05002D2A60 /* libsqlite3.dylib */,
 				FB89468F19F6AFB800339C8A /* libs */,
 				FB7E794319C8B71B00A15F68 /* libiconv.dylib */,
 				FB290DC319B2E98F004C83CF /* libxml2.dylib */,
@@ -293,17 +400,23 @@
 		FB290CF919B2C406004C83CF /* Limelight */ = {
 			isa = PBXGroup;
 			children = (
+				9E5D5FF61A5A5A3900689918 /* Font */,
 				FB89460419F646E200339C8A /* Crypto */,
 				FB89460919F646E200339C8A /* Input */,
 				FB89460E19F646E200339C8A /* Network */,
 				FB89461519F646E200339C8A /* Stream */,
 				FB89461E19F646E200339C8A /* Utility */,
 				FB89462319F646E200339C8A /* ViewControllers */,
+				FBD3495F1A004453002D2A60 /* Database */,
 				FB290CFA19B2C406004C83CF /* Supporting Files */,
 				FB290D0219B2C406004C83CF /* AppDelegate.h */,
 				FB290D0319B2C406004C83CF /* AppDelegate.m */,
-				FB290E7819B37D81004C83CF /* MainFrame-iPad.storyboard */,
-				FB290E7A19B38036004C83CF /* MainFrame-iPhone.storyboard */,
+				FBDE86DE19F7A837001C18A8 /* UIComputerView.h */,
+				FBDE86DF19F7A837001C18A8 /* UIComputerView.m */,
+				FBDE86E419F82297001C18A8 /* UIAppView.h */,
+				FBDE86E519F82297001C18A8 /* UIAppView.m */,
+				FB290E7819B37D81004C83CF /* iPad.storyboard */,
+				FB290E7A19B38036004C83CF /* iPhone.storyboard */,
 				FB89463719F6473800339C8A /* Launch Screen.xib */,
 				FB290D0819B2C406004C83CF /* Images.xcassets */,
 				FB290D0519B2C406004C83CF /* Limelight.xcdatamodeld */,
@@ -356,8 +469,12 @@
 			children = (
 				FB89460A19F646E200339C8A /* ControllerSupport.h */,
 				FB89460B19F646E200339C8A /* ControllerSupport.m */,
+				FB9AFD411A7F0C6900872C98 /* Controller.h */,
+				FB9AFD421A7F0C6900872C98 /* Controller.m */,
 				FB89460C19F646E200339C8A /* StreamView.h */,
 				FB89460D19F646E200339C8A /* StreamView.m */,
+				FB4678EB1A50C40900377732 /* OnScreenControls.h */,
+				FB4678EC1A50C40900377732 /* OnScreenControls.m */,
 			);
 			path = Input;
 			sourceTree = "<group>";
@@ -365,12 +482,13 @@
 		FB89460E19F646E200339C8A /* Network */ = {
 			isa = PBXGroup;
 			children = (
-				FB89460F19F646E200339C8A /* HttpManager.h */,
-				FB89461019F646E200339C8A /* HttpManager.m */,
-				FB89461119F646E200339C8A /* MDNSManager.h */,
-				FB89461219F646E200339C8A /* MDNSManager.m */,
+				FB9AFD2F1A7C979700872C98 /* Http */,
+				FB9AFD341A7D877B00872C98 /* Discovery */,
+				FB9AFD331A7D876F00872C98 /* AppAsset */,
 				FB89461319F646E200339C8A /* PairManager.h */,
 				FB89461419F646E200339C8A /* PairManager.m */,
+				FB4678FD1A565DAC00377732 /* WakeOnLanManager.h */,
+				FB4678FE1A565DAC00377732 /* WakeOnLanManager.m */,
 			);
 			path = Network;
 			sourceTree = "<group>";
@@ -393,10 +511,12 @@
 		FB89461E19F646E200339C8A /* Utility */ = {
 			isa = PBXGroup;
 			children = (
-				FB89461F19F646E200339C8A /* Computer.h */,
-				FB89462019F646E200339C8A /* Computer.m */,
+				FBDE86E719F82315001C18A8 /* App.h */,
+				FBDE86E819F82315001C18A8 /* App.m */,
 				FB89462119F646E200339C8A /* Utils.h */,
 				FB89462219F646E200339C8A /* Utils.m */,
+				FBD1C8E01A8AD69E00C6703C /* Logger.h */,
+				FBD1C8E11A8AD71400C6703C /* Logger.m */,
 			);
 			path = Utility;
 			sourceTree = "<group>";
@@ -404,10 +524,16 @@
 		FB89462319F646E200339C8A /* ViewControllers */ = {
 			isa = PBXGroup;
 			children = (
+				FBD3495119FF36FB002D2A60 /* SWRevealViewController.h */,
+				FBD3495219FF36FB002D2A60 /* SWRevealViewController.m */,
 				FB89462419F646E200339C8A /* MainFrameViewController.h */,
 				FB89462519F646E200339C8A /* MainFrameViewController.m */,
 				FB89462619F646E200339C8A /* StreamFrameViewController.h */,
 				FB89462719F646E200339C8A /* StreamFrameViewController.m */,
+				FBD3494E19FF2174002D2A60 /* SettingsViewController.h */,
+				FBD3494F19FF2174002D2A60 /* SettingsViewController.m */,
+				FB4A23B61A9D3637004D2EF2 /* LoadingFrameViewController.h */,
+				FB4A23B71A9D3637004D2EF2 /* LoadingFrameViewController.m */,
 			);
 			path = ViewControllers;
 			sourceTree = "<group>";
@@ -573,6 +699,62 @@
 			path = lib;
 			sourceTree = "<group>";
 		};
+		FB9AFD2F1A7C979700872C98 /* Http */ = {
+			isa = PBXGroup;
+			children = (
+				FB89460F19F646E200339C8A /* HttpManager.h */,
+				FB89461019F646E200339C8A /* HttpManager.m */,
+				FB9AFD351A7E02DB00872C98 /* HttpRequest.h */,
+				FB9AFD361A7E02DB00872C98 /* HttpRequest.m */,
+				FB9AFD261A7C84ED00872C98 /* HttpResponse.h */,
+				FB9AFD271A7C84ED00872C98 /* HttpResponse.m */,
+				FB9AFD381A7E05CE00872C98 /* ServerInfoResponse.h */,
+				FB9AFD391A7E05CE00872C98 /* ServerInfoResponse.m */,
+				FB9AFD3B1A7E111600872C98 /* AppAssetResponse.h */,
+				FB9AFD3C1A7E111600872C98 /* AppAssetResponse.m */,
+				FB9AFD3E1A7E127D00872C98 /* AppListResponse.h */,
+				FB9AFD3F1A7E127D00872C98 /* AppListResponse.m */,
+			);
+			name = Http;
+			sourceTree = "<group>";
+		};
+		FB9AFD331A7D876F00872C98 /* AppAsset */ = {
+			isa = PBXGroup;
+			children = (
+				FBD3494119FC9C04002D2A60 /* AppAssetManager.h */,
+				FBD3494219FC9C04002D2A60 /* AppAssetManager.m */,
+				FB9AFD301A7D867C00872C98 /* AppAssetRetriever.h */,
+				FB9AFD311A7D867C00872C98 /* AppAssetRetriever.m */,
+			);
+			name = AppAsset;
+			sourceTree = "<group>";
+		};
+		FB9AFD341A7D877B00872C98 /* Discovery */ = {
+			isa = PBXGroup;
+			children = (
+				FB4678F81A55FFAD00377732 /* DiscoveryManager.h */,
+				FB4678F91A55FFAD00377732 /* DiscoveryManager.m */,
+				FB6549541A57907E001C8F39 /* DiscoveryWorker.h */,
+				FB6549551A57907E001C8F39 /* DiscoveryWorker.m */,
+				FB89461119F646E200339C8A /* MDNSManager.h */,
+				FB89461219F646E200339C8A /* MDNSManager.m */,
+			);
+			name = Discovery;
+			sourceTree = "<group>";
+		};
+		FBD3495F1A004453002D2A60 /* Database */ = {
+			isa = PBXGroup;
+			children = (
+				FBD3495C1A004412002D2A60 /* Settings.h */,
+				FBD3495D1A004412002D2A60 /* Settings.m */,
+				FBD349591A004411002D2A60 /* Host.h */,
+				FBD3495A1A004411002D2A60 /* Host.m */,
+				FBD349601A0089F6002D2A60 /* DataManager.h */,
+				FBD349611A0089F6002D2A60 /* DataManager.m */,
+			);
+			name = Database;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -668,11 +850,18 @@
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				FB290E7919B37D81004C83CF /* MainFrame-iPad.storyboard in Resources */,
+				FB290E7919B37D81004C83CF /* iPad.storyboard in Resources */,
+				9E5D60161A5A5A3900689918 /* Roboto-Thin.ttf in Resources */,
+				9E5D60151A5A5A3900689918 /* Roboto-Regular.ttf in Resources */,
+				9E5D600B1A5A5A3900689918 /* Apache License.txt in Resources */,
+				9E5D60111A5A5A3900689918 /* Roboto-Light.ttf in Resources */,
 				FB290CFE19B2C406004C83CF /* InfoPlist.strings in Resources */,
-				FB290E7B19B38036004C83CF /* MainFrame-iPhone.storyboard in Resources */,
+				FB290E7B19B38036004C83CF /* iPhone.storyboard in Resources */,
+				9E5D600C1A5A5A3900689918 /* Roboto-Black.ttf in Resources */,
+				9E5D600E1A5A5A3900689918 /* Roboto-Bold.ttf in Resources */,
 				FB290D0919B2C406004C83CF /* Images.xcassets in Resources */,
 				FB89463819F6473800339C8A /* Launch Screen.xib in Resources */,
+				9E5D60131A5A5A3900689918 /* Roboto-Medium.ttf in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -693,21 +882,42 @@
 			files = (
 				FB290D0719B2C406004C83CF /* Limelight.xcdatamodeld in Sources */,
 				FB89463219F646E200339C8A /* VideoDecoderRenderer.m in Sources */,
+				FBD3495E1A004412002D2A60 /* Settings.m in Sources */,
 				FB290D0419B2C406004C83CF /* AppDelegate.m in Sources */,
+				FB9AFD401A7E127D00872C98 /* AppListResponse.m in Sources */,
 				FB89463419F646E200339C8A /* Utils.m in Sources */,
-				FB89463319F646E200339C8A /* Computer.m in Sources */,
+				FBDE86E619F82297001C18A8 /* UIAppView.m in Sources */,
 				FB89462F19F646E200339C8A /* Connection.m in Sources */,
+				FB9AFD321A7D867C00872C98 /* AppAssetRetriever.m in Sources */,
+				FB4678FF1A565DAC00377732 /* WakeOnLanManager.m in Sources */,
 				FB89462919F646E200339C8A /* mkcert.c in Sources */,
+				FB9AFD281A7C84ED00872C98 /* HttpResponse.m in Sources */,
+				FBDE86E019F7A837001C18A8 /* UIComputerView.m in Sources */,
+				FBDE86E919F82315001C18A8 /* App.m in Sources */,
 				FB89463019F646E200339C8A /* StreamConfiguration.m in Sources */,
+				FBD3495319FF36FB002D2A60 /* SWRevealViewController.m in Sources */,
+				FBD3495019FF2174002D2A60 /* SettingsViewController.m in Sources */,
 				FB89462C19F646E200339C8A /* HttpManager.m in Sources */,
 				FB89462D19F646E200339C8A /* MDNSManager.m in Sources */,
 				FB89462B19F646E200339C8A /* StreamView.m in Sources */,
+				FB4678FA1A55FFAD00377732 /* DiscoveryManager.m in Sources */,
+				FBD3495B1A004411002D2A60 /* Host.m in Sources */,
 				FB89463519F646E200339C8A /* MainFrameViewController.m in Sources */,
+				FBD1C8E21A8AD71400C6703C /* Logger.m in Sources */,
 				FB89463619F646E200339C8A /* StreamFrameViewController.m in Sources */,
 				FB89462819F646E200339C8A /* CryptoManager.m in Sources */,
 				FB89462E19F646E200339C8A /* PairManager.m in Sources */,
+				FB9AFD371A7E02DB00872C98 /* HttpRequest.m in Sources */,
+				FB4678ED1A50C40900377732 /* OnScreenControls.m in Sources */,
 				FB290D0019B2C406004C83CF /* main.m in Sources */,
+				FB9AFD431A7F0C6900872C98 /* Controller.m in Sources */,
+				FBD3494319FC9C04002D2A60 /* AppAssetManager.m in Sources */,
+				FB6549561A57907E001C8F39 /* DiscoveryWorker.m in Sources */,
 				FB89462A19F646E200339C8A /* ControllerSupport.m in Sources */,
+				FB9AFD3D1A7E111600872C98 /* AppAssetResponse.m in Sources */,
+				FBD349621A0089F6002D2A60 /* DataManager.m in Sources */,
+				FB4A23B81A9D3637004D2EF2 /* LoadingFrameViewController.m in Sources */,
+				FB9AFD3A1A7E05CE00872C98 /* ServerInfoResponse.m in Sources */,
 				FB89463119F646E200339C8A /* StreamManager.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
@@ -771,8 +981,8 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				COPY_PHASE_STRIP = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
 				GCC_DYNAMIC_NO_PIC = NO;
@@ -811,8 +1021,8 @@
 				CLANG_WARN_INT_CONVERSION = YES;
 				CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
 				CLANG_WARN__DUPLICATE_METHOD_MATCH = YES;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Diego Waxemberg (DM46QST4M7)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Diego Waxemberg (DM46QST4M7)";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				COPY_PHASE_STRIP = YES;
 				ENABLE_NS_ASSERTIONS = NO;
 				GCC_C_LANGUAGE_STANDARD = gnu99;
@@ -823,7 +1033,7 @@
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
 				IPHONEOS_DEPLOYMENT_TARGET = 8.0;
-				PROVISIONING_PROFILE = "d8351c44-2c9d-4b3a-bc67-ea963350dcbe";
+				PROVISIONING_PROFILE = "";
 				SDKROOT = iphoneos;
 				TARGETED_DEVICE_FAMILY = "1,2";
 				VALIDATE_PRODUCT = YES;
@@ -834,8 +1044,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
+				CODE_SIGN_IDENTITY = "iPhone Developer";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Limelight/Limelight-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
@@ -862,8 +1072,8 @@
 			isa = XCBuildConfiguration;
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
-				CODE_SIGN_IDENTITY = "iPhone Distribution: Diego Waxemberg (DM46QST4M7)";
-				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution: Diego Waxemberg (DM46QST4M7)";
+				CODE_SIGN_IDENTITY = "iPhone Distribution";
+				"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Distribution";
 				GCC_PRECOMPILE_PREFIX_HEADER = YES;
 				GCC_PREFIX_HEADER = "Limelight/Limelight-Prefix.pch";
 				HEADER_SEARCH_PATHS = (
@@ -880,7 +1090,7 @@
 					"$(PROJECT_DIR)/libs/openssl/lib",
 				);
 				PRODUCT_NAME = "$(TARGET_NAME)";
-				PROVISIONING_PROFILE = "d8351c44-2c9d-4b3a-bc67-ea963350dcbe";
+				PROVISIONING_PROFILE = "";
 				SKIP_INSTALL = NO;
 				WRAPPER_EXTENSION = app;
 			};
@@ -962,9 +1172,11 @@
 		FB290D0519B2C406004C83CF /* Limelight.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				FB6549621A60B4A9001C8F39 /* Limelight 0.3.1.xcdatamodel */,
+				FB4678F21A51BDCB00377732 /* Limelight 0.3.0.xcdatamodel */,
 				FB290D0619B2C406004C83CF /* Limelight.xcdatamodel */,
 			);
-			currentVersion = FB290D0619B2C406004C83CF /* Limelight.xcdatamodel */;
+			currentVersion = FB6549621A60B4A9001C8F39 /* Limelight 0.3.1.xcdatamodel */;
 			path = Limelight.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;

Limelight.xcodeproj/project.xcworkspace/contents.xcworkspacedata

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Workspace
+   version = "1.0">
+   <FileRef
+      location = "self:Limelight.xcodeproj">
+   </FileRef>
+</Workspace>

Limelight.xcodeproj/project.xcworkspace/xcshareddata/Limelight.xccheckout

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>IDESourceControlProjectFavoriteDictionaryKey</key>
+	<false/>
+	<key>IDESourceControlProjectIdentifier</key>
+	<string>054A62F3-1197-45FB-A607-EA7922396E24</string>
+	<key>IDESourceControlProjectName</key>
+	<string>Limelight</string>
+	<key>IDESourceControlProjectOriginsDictionary</key>
+	<dict>
+		<key>A4B0849259F9566B0CBA84A6D3D4A0F895C03123</key>
+		<string>github.com:limelight-stream/limelight-ios.git</string>
+		<key>EB99D631D5149240E91F8D168F0F298D7A5BAA89</key>
+		<string>github.com:limelight-stream/limelight-common-c.git</string>
+	</dict>
+	<key>IDESourceControlProjectPath</key>
+	<string>Limelight.xcodeproj</string>
+	<key>IDESourceControlProjectRelativeInstallPathDictionary</key>
+	<dict>
+		<key>A4B0849259F9566B0CBA84A6D3D4A0F895C03123</key>
+		<string>../..</string>
+		<key>EB99D631D5149240E91F8D168F0F298D7A5BAA89</key>
+		<string>../../limelight-common-c</string>
+	</dict>
+	<key>IDESourceControlProjectURL</key>
+	<string>github.com:limelight-stream/limelight-ios.git</string>
+	<key>IDESourceControlProjectVersion</key>
+	<integer>111</integer>
+	<key>IDESourceControlProjectWCCIdentifier</key>
+	<string>A4B0849259F9566B0CBA84A6D3D4A0F895C03123</string>
+	<key>IDESourceControlProjectWCConfigurations</key>
+	<array>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>EB99D631D5149240E91F8D168F0F298D7A5BAA89</string>
+			<key>IDESourceControlWCCName</key>
+			<string>limelight-common-c</string>
+		</dict>
+		<dict>
+			<key>IDESourceControlRepositoryExtensionIdentifierKey</key>
+			<string>public.vcs.git</string>
+			<key>IDESourceControlWCCIdentifierKey</key>
+			<string>A4B0849259F9566B0CBA84A6D3D4A0F895C03123</string>
+			<key>IDESourceControlWCCName</key>
+			<string>limelight-ios</string>
+		</dict>
+	</array>
+</dict>
+</plist>

Limelight/App.h

@@ -0,0 +1,18 @@
+//
+//  App.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/22/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface App : NSObject
+
+@property NSString* appId;
+@property NSString* appName;
+@property UIImage* appImage;
+@property BOOL isRunning;
+
+@end

Limelight/App.m

@@ -0,0 +1,15 @@
+//
+//  App.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/22/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "App.h"
+#import "HttpManager.h"
+
+@implementation App
+@synthesize appId, appName, appImage, isRunning;
+
+@end

Limelight/AppDelegate.h

@@ -18,5 +18,6 @@
 
 - (void)saveContext;
 - (NSURL *)applicationDocumentsDirectory;
+- (NSURL*) getStoreURL;
 
 @end

Limelight/AppDelegate.m

@@ -18,6 +18,34 @@ static NSOperationQueue* mainQueue;
 
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
+    [[UILabel appearance] setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]];
+    [[UIButton appearance].titleLabel setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]];
+
+
+    // Generate selected segment background image
+    CGSize borderImageSize = CGSizeMake(1.f, 100.f);
+    
+    UIGraphicsBeginImageContext(borderImageSize);
+    CGContextRef context = UIGraphicsGetCurrentContext();
+    
+    CGContextSetStrokeColorWithColor(context, [UIColor whiteColor].CGColor);
+    CGContextFillRect(context, CGRectMake(0.f, borderImageSize.height * 0.8, borderImageSize.width, borderImageSize.height));
+    
+    UIImage *selectedSegmentBG = UIGraphicsGetImageFromCurrentImageContext();
+    UIGraphicsEndImageContext();
+    
+    // Clear default border and background color
+    [[UISegmentedControl appearance] setBackgroundImage:[[UIImage alloc] init] forState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
+    [[UISegmentedControl appearance] setDividerImage:[[UIImage alloc] init] forLeftSegmentState:UIControlStateNormal rightSegmentState:UIControlStateNormal barMetrics:UIBarMetricsDefault];
+    
+    // Set selected segment background image
+    [[UISegmentedControl appearance] setBackgroundImage:[selectedSegmentBG imageWithRenderingMode:UIImageRenderingModeAlwaysTemplate] forState:UIControlStateSelected barMetrics:UIBarMetricsDefault];
+    
+    // Change font on UISegmentedControl
+    [[UISegmentedControl appearance] setTitleTextAttributes:[NSDictionary dictionaryWithObjectsAndKeys:
+                                                             [UIColor whiteColor], NSForegroundColorAttributeName,
+                                                             [UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]], NSFontAttributeName, nil] forState:UIControlStateNormal];
+    
     return YES;
 }
 
@@ -57,7 +85,7 @@ static NSOperationQueue* mainQueue;
         if ([managedObjectContext hasChanges] && ![managedObjectContext save:&error]) {
              // Replace this implementation with code to handle the error appropriately.
              // abort() causes the application to generate a crash log and terminate. You should not use this function in a shipping application, although it may be useful during development.
-            NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
+            Log(LOG_E, @"Unresolved error %@, %@", error, [error userInfo]);
             abort();
         } 
     }
@@ -88,8 +116,7 @@ static NSOperationQueue* mainQueue;
     if (_managedObjectModel != nil) {
         return _managedObjectModel;
     }
-    NSURL *modelURL = [[NSBundle mainBundle] URLForResource:@"Limelight_iOS" withExtension:@"momd"];
-    _managedObjectModel = [[NSManagedObjectModel alloc] initWithContentsOfURL:modelURL];
+    _managedObjectModel = [NSManagedObjectModel mergedModelFromBundles:nil];
     return _managedObjectModel;
 }
 
@@ -101,11 +128,14 @@ static NSOperationQueue* mainQueue;
         return _persistentStoreCoordinator;
     }
     
-    NSURL *storeURL = [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"Limelight_iOS.sqlite"];
+    NSURL *storeURL = [self getStoreURL];
     
     NSError *error = nil;
     _persistentStoreCoordinator = [[NSPersistentStoreCoordinator alloc] initWithManagedObjectModel:[self managedObjectModel]];
-    if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:nil error:&error]) {
+    NSDictionary *options = [NSDictionary dictionaryWithObjectsAndKeys:
+                             [NSNumber numberWithBool:YES], NSMigratePersistentStoresAutomaticallyOption,
+                             [NSNumber numberWithBool:YES], NSInferMappingModelAutomaticallyOption, nil];
+    if (![_persistentStoreCoordinator addPersistentStoreWithType:NSSQLiteStoreType configuration:nil URL:storeURL options:options error:&error]) {
         /*
          Replace this implementation with code to handle the error appropriately.
          
@@ -129,7 +159,7 @@ static NSOperationQueue* mainQueue;
          Lightweight migration will only work for a limited set of schema changes; consult "Core Data Model Versioning and Data Migration Programming Guide" for details.
          
          */
-        NSLog(@"Unresolved error %@, %@", error, [error userInfo]);
+        Log(LOG_E, @"Unresolved error %@, %@", error, [error userInfo]);
         abort();
     }    
     
@@ -144,4 +174,8 @@ static NSOperationQueue* mainQueue;
     return [[[NSFileManager defaultManager] URLsForDirectory:NSDocumentDirectory inDomains:NSUserDomainMask] lastObject];
 }
 
+- (NSURL*) getStoreURL {
+    return [[self applicationDocumentsDirectory] URLByAppendingPathComponent:@"Limelight_iOS.sqlite"];
+}
+
 @end

Limelight/Crypto/CryptoManager.m

@@ -86,7 +86,7 @@ static NSData* p12 = nil;
     BIO_free(bio);
     
     if (!x509) {
-        fprintf(stderr, "unable to parse certificate in memory\n");
+        Log(LOG_E, @"Unable to parse certificate in memory");
         return NULL;
     }
     
@@ -115,7 +115,7 @@ static NSData* p12 = nil;
     BIO_free(bio);
     
     if (!pkey) {
-        fprintf(stderr, "unable to parse private key in memory\n");
+        Log(LOG_E, @"Unable to parse private key in memory!");
         return NULL;
     }
     
@@ -195,28 +195,32 @@ static NSData* p12 = nil;
     x509 = PEM_read_bio_X509(bio, NULL, NULL, NULL);
     
     if (!x509) {
-        fprintf(stderr, "unable to parse certificate in memory\n");
+        Log(LOG_E, @"Unable to parse certificate in memory!");
         return NULL;
     }
     return [NSData dataWithBytes:x509->signature->data length:x509->signature->length];
 }
 
 + (void) generateKeyPairUsingSSl {
-    if (![CryptoManager keyPairExists]) {
-        
-        NSLog(@"Generating Certificate... ");
-        CertKeyPair certKeyPair = generateCertKeyPair();
-        
-        NSArray* paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
-        NSString* documentsDirectory = [paths objectAtIndex:0];
-        NSString* certFile = [documentsDirectory stringByAppendingPathComponent:@"client.crt"];
-        NSString* keyPairFile = [documentsDirectory stringByAppendingPathComponent:@"client.key"];
-        NSString* p12File = [documentsDirectory stringByAppendingPathComponent:@"client.p12"];
-        
-        //NSLog(@"Writing cert and key to: \n%@\n%@", certFile, keyPairFile);
-        saveCertKeyPair([certFile UTF8String], [p12File UTF8String], [keyPairFile UTF8String], certKeyPair);
-        freeCertKeyPair(certKeyPair);
-    }
+    static dispatch_once_t pred;
+    dispatch_once(&pred, ^{
+        if (![CryptoManager keyPairExists]) {
+            
+            Log(LOG_I, @"Generating Certificate... ");
+            CertKeyPair certKeyPair = generateCertKeyPair();
+            
+            NSArray* paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+            NSString* documentsDirectory = [paths objectAtIndex:0];
+            NSString* certFile = [documentsDirectory stringByAppendingPathComponent:@"client.crt"];
+            NSString* keyPairFile = [documentsDirectory stringByAppendingPathComponent:@"client.key"];
+            NSString* p12File = [documentsDirectory stringByAppendingPathComponent:@"client.p12"];
+            
+            //Log(LOG_D, @"Writing cert and key to: \n%@\n%@", certFile, keyPairFile);
+            saveCertKeyPair([certFile UTF8String], [p12File UTF8String], [keyPairFile UTF8String], certKeyPair);
+            freeCertKeyPair(certKeyPair);
+            Log(LOG_I, @"Certificate created");
+        }
+    });
 }
 
 + (NSString*) getUniqueID {
@@ -229,7 +233,7 @@ static NSData* p12 = nil;
     NSMutableString* uniqueId = [NSMutableString stringWithString:[idString substringFromIndex:19]];
     [uniqueId deleteCharactersInRange:NSMakeRange(4, 1)];
     
-    //NSLog(@"Unique ID: %@", uniqueId);
+    //Log(LOG_D, @"Unique ID: %@", uniqueId);
     return [NSString stringWithString:uniqueId];
 }
 

Limelight/Database/DataManager.h

@@ -0,0 +1,25 @@
+//
+//  DataManager.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/28/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Settings.h"
+#import "AppDelegate.h"
+#import "Host.h"
+
+@interface DataManager : NSObject
+
+@property (strong, nonatomic) AppDelegate* appDelegate;
+
+- (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls;
+- (Settings*) retrieveSettings;
+- (NSArray*) retrieveHosts;
+- (void) saveHosts;
+- (Host*) createHost;
+- (void) removeHost:(Host*)host;
+
+@end

Limelight/Database/DataManager.m

@@ -0,0 +1,86 @@
+//
+//  DataManager.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/28/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "DataManager.h"
+
+@implementation DataManager
+
+- (id) init {
+    self = [super init];
+    self.appDelegate = [[UIApplication sharedApplication] delegate];
+    return self;
+}
+
+- (void) saveSettingsWithBitrate:(NSInteger)bitrate framerate:(NSInteger)framerate height:(NSInteger)height width:(NSInteger)width onscreenControls:(NSInteger)onscreenControls {
+    Settings* settingsToSave = [self retrieveSettings];
+    settingsToSave.framerate = [NSNumber numberWithInteger:framerate];
+    // Bitrate is persisted in kbps
+    settingsToSave.bitrate = [NSNumber numberWithInteger:bitrate];
+    settingsToSave.height = [NSNumber numberWithInteger:height];
+    settingsToSave.width = [NSNumber numberWithInteger:width];
+    settingsToSave.onscreenControls = [NSNumber numberWithInteger:onscreenControls];
+
+    NSError* error;
+    if (![[self.appDelegate managedObjectContext] save:&error]) {
+        Log(LOG_E, @"Unable to save settings to database: %@", error);
+    }
+    [self.appDelegate saveContext];
+}
+
+- (Settings*) retrieveSettings {
+    NSArray* fetchedRecords = [self fetchRecords:@"Settings"];
+    if (fetchedRecords.count == 0) {
+        // create a new settings object with the default values
+        NSEntityDescription* entity = [NSEntityDescription entityForName:@"Settings" inManagedObjectContext:[self.appDelegate managedObjectContext]];
+        Settings* settings = [[Settings alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
+        
+        return settings;
+    } else {
+        // we should only ever have 1 settings object stored
+        return [fetchedRecords objectAtIndex:0];
+    }
+}
+
+- (Host*) createHost {
+    NSEntityDescription* entity = [NSEntityDescription entityForName:@"Host" inManagedObjectContext:[self.appDelegate managedObjectContext]];
+    Host* host = [[Host alloc] initWithEntity:entity insertIntoManagedObjectContext:[self.appDelegate managedObjectContext]];
+    return host;
+}
+
+- (void) removeHost:(Host*)host {
+    [[self.appDelegate managedObjectContext] deleteObject:host];
+}
+
+- (void) saveHosts {
+    NSError* error;
+    if (![[self.appDelegate managedObjectContext] save:&error]) {
+        Log(LOG_E, @"Unable to save hosts to database: %@", error);
+    }
+    [self.appDelegate saveContext];
+}
+
+- (NSArray*) retrieveHosts {
+    return [self fetchRecords:@"Host"];
+}
+
+- (NSArray*) fetchRecords:(NSString*)entityName {
+    NSFetchRequest* fetchRequest = [[NSFetchRequest alloc] init];
+    NSEntityDescription* entity = [NSEntityDescription entityForName:entityName inManagedObjectContext:[self.appDelegate managedObjectContext]];
+    [fetchRequest setEntity:entity];
+    [fetchRequest setAffectedStores:[NSArray arrayWithObjects:[[self.appDelegate persistentStoreCoordinator] persistentStoreForURL:[self.appDelegate getStoreURL]], nil]];
+    
+    NSError* error;
+    NSArray* fetchedRecords = [[self.appDelegate managedObjectContext] executeFetchRequest:fetchRequest error:&error];
+    //TODO: handle errors
+    
+    return fetchedRecords;
+    
+}
+
+@end
+

Limelight/Database/Host.h

@@ -0,0 +1,24 @@
+//
+//  Host.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/28/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+#import "Utils.h"
+
+@interface Host : NSManagedObject
+
+@property (nonatomic, retain) NSString * name;
+@property (nonatomic, retain) NSString * address;
+@property (nonatomic, retain) NSString * localAddress;
+@property (nonatomic, retain) NSString * externalAddress;
+@property (nonatomic, retain) NSString * uuid;
+@property (nonatomic, retain) NSString * mac;
+@property (nonatomic) BOOL online;
+@property (nonatomic) PairState pairState;
+
+@end

Limelight/Database/Host.m

@@ -0,0 +1,23 @@
+//
+//  Host.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/28/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "Host.h"
+
+
+@implementation Host
+
+@dynamic name;
+@dynamic address;
+@dynamic localAddress;
+@dynamic externalAddress;
+@dynamic uuid;
+@dynamic mac;
+@dynamic pairState;
+@synthesize online;
+
+@end

Limelight/Database/Settings.h

@@ -0,0 +1,21 @@
+//
+//  Settings.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/28/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import <CoreData/CoreData.h>
+
+
+@interface Settings : NSManagedObject
+
+@property (nonatomic, retain) NSNumber * bitrate;
+@property (nonatomic, retain) NSNumber * framerate;
+@property (nonatomic, retain) NSNumber * height;
+@property (nonatomic, retain) NSNumber * width;
+@property (nonatomic, retain) NSNumber * onscreenControls;
+
+@end

Limelight/Database/Settings.m

@@ -0,0 +1,20 @@
+//
+//  Settings.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/28/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "Settings.h"
+
+
+@implementation Settings
+
+@dynamic bitrate;
+@dynamic framerate;
+@dynamic height;
+@dynamic width;
+@dynamic onscreenControls;
+
+@end

Limelight/Font/Roboto/Apache License.txt

@@ -0,0 +1,203 @@
+Font data copyright Google 2012
+
+                                Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Limelight/Images.xcassets/AButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "a_button.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "a_button-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "a_button-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/AddComputerIcon.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "limelight_computer_add_icon_1x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "limelight_computer_add_icon_2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "limelight_computer_add_icon_3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/AppIcon.appiconset/Contents.json

@@ -1,68 +1,80 @@
 {
   "images" : [
     {
+      "idiom" : "iphone",
       "size" : "29x29",
-      "idiom" : "iphone",
-      "filename" : "app_icon_58x58_2x-1.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "filename" : "Icon-Small@2x.png"
     },
     {
+      "idiom" : "iphone",
+      "size" : "29x29",
+      "scale" : "3x",
+      "filename" : "[email protected]"
+    },
+    {
+      "idiom" : "iphone",
       "size" : "40x40",
-      "idiom" : "iphone",
-      "filename" : "app_icon_80x80_2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "filename" : "Icon-40@2x.png"
     },
     {
+      "idiom" : "iphone",
+      "size" : "40x40",
+      "scale" : "3x",
+      "filename" : "[email protected]"
+    },
+    {
+      "idiom" : "iphone",
       "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "app_icon_120x120_2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "filename" : "Icon-60@2x.png"
     },
     {
+      "idiom" : "iphone",
       "size" : "60x60",
-      "idiom" : "iphone",
-      "filename" : "app_icon_180x180_3x.png",
-      "scale" : "3x"
+      "scale" : "3x",
+      "filename" : "Icon-60@3x.png"
     },
     {
+      "idiom" : "ipad",
       "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "app_icon_29x29_1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "Icon-Small.png"
     },
     {
+      "idiom" : "ipad",
       "size" : "29x29",
-      "idiom" : "ipad",
-      "filename" : "app_icon_58x58_2x.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "filename" : "Icon-Small@2x.png"
     },
     {
+      "idiom" : "ipad",
       "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "app_icon_40x40_1x.png",
-      "scale" : "1x"
+      "scale" : "1x",
+      "filename" : "Icon-40.png"
     },
     {
+      "idiom" : "ipad",
       "size" : "40x40",
-      "idiom" : "ipad",
-      "filename" : "app_icon_80x80_2x-1.png",
-      "scale" : "2x"
+      "scale" : "2x",
+      "filename" : "Icon-40@2x.png"
     },
     {
-      "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "app_icon_76x76_1x.png",
-      "scale" : "1x"
+      "size" : "76x76",
+      "scale" : "1x",
+      "filename" : "Icon-76.png"
     },
     {
-      "size" : "76x76",
       "idiom" : "ipad",
-      "filename" : "app_icon_152x152_2x.png",
-      "scale" : "2x"
+      "size" : "76x76",
+      "scale" : "2x",
+      "filename" : "[email protected]"
     }
   ],
   "info" : {
     "version" : 1,
-    "author" : "xcode"
+    "author" : "makeappicon"
   }
 }

Limelight/Images.xcassets/BButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "b_button.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "b_button-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "b_button-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/Computer.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "limelight_computer_1x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "limelight_computer_2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "limelight_computer_3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/DownButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "down.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "down-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "down-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/L1.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "L1-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "L1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "L1-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/L2.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "L2.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "L2-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "L2-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/L3.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "L3.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "L3-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "L3-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/LeftButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "left.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "left-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "left-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/Limelight Flat Design Banner.imageset/Contents.json

@@ -2,12 +2,12 @@
   "images" : [
     {
       "idiom" : "universal",
-      "scale" : "1x",
-      "filename" : "store_icon_1024x1024.png"
+      "scale" : "1x"
     },
     {
       "idiom" : "universal",
-      "scale" : "2x"
+      "scale" : "2x",
+      "filename" : "Limelight Flat Design Banner.png"
     },
     {
       "idiom" : "universal",

Limelight/Images.xcassets/Logo.imageset/Contents.json

@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "Limelight-logo.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/NoAppImage.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "limelight_no_app_image_1x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "limelight_no_app_image_2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "limelight_no_app_image_3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/R1.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "R1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "R1-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "R1-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/R2.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "R2-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "R2.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "R2-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/R3.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "R3.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "R3-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "R3-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/RightButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "right.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "right-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "right-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/SelectButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "select_button-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "select_button.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "select_button-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/Settings.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "settings_1x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "settings_2x.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "settings_3x.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/StartButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "start_button-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "start_button.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "start_button-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/StickInner.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "stick_inner-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "stick_inner.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "stick_inner-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/StickOuter.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "stick_outer-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "stick_outer.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "stick_outer-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/UpButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "up-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "up.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "up-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/XButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "x_button-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "x_button.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "x_button-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Images.xcassets/YButton.imageset/Contents.json

@@ -0,0 +1,23 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "scale" : "1x",
+      "filename" : "y_button.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "2x",
+      "filename" : "y_button-1.png"
+    },
+    {
+      "idiom" : "universal",
+      "scale" : "3x",
+      "filename" : "y_button-2.png"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}

Limelight/Input/Controller.h

@@ -0,0 +1,23 @@
+//
+//  Controller.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@interface Controller : NSObject
+
+@property (nonatomic) int playerIndex;
+@property (nonatomic) int lastButtonFlags;
+@property (nonatomic) int emulatingButtonFlags;
+@property (nonatomic) char lastLeftTrigger;
+@property (nonatomic) char lastRightTrigger;
+@property (nonatomic) short lastLeftStickX;
+@property (nonatomic) short lastLeftStickY;
+@property (nonatomic) short lastRightStickX;
+@property (nonatomic) short lastRightStickY;
+
+@end

Limelight/Input/Controller.m

@@ -0,0 +1,15 @@
+//
+//  Controller.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "Controller.h"
+
+@implementation Controller
+@synthesize playerIndex;
+@synthesize lastButtonFlags, emulatingButtonFlags, lastLeftTrigger, lastRightTrigger;
+@synthesize lastLeftStickX, lastLeftStickY, lastRightStickX, lastRightStickY;
+@end

Limelight/Input/ControllerSupport.h

@@ -7,13 +7,29 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "Controller.h"
+
+@class OnScreenControls;
 
 @interface ControllerSupport : NSObject
 
 -(id) init;
-
+-(void) initAutoOnScreenControlMode:(OnScreenControls*)osc;
 -(void) cleanup;
 
+-(void) updateLeftStick:(Controller*)controller x:(short)x y:(short)y;
+-(void) updateRightStick:(Controller*)controller x:(short)x y:(short)y;
+
+-(void) updateLeftTrigger:(Controller*)controller left:(char)left;
+-(void) updateRightTrigger:(Controller*)controller right:(char)right;
+-(void) updateTriggers:(Controller*)controller left:(char)left right:(char)right;
+
+-(void) updateButtonFlags:(Controller*)controller flags:(int)flags;
+-(void) setButtonFlag:(Controller*)controller flags:(int)flags;
+-(void) clearButtonFlag:(Controller*)controller flags:(int)flags;
+
+-(void) updateFinished:(Controller*)controller;
+
 @property (nonatomic, strong) id connectObserver;
 @property (nonatomic, strong) id disconnectObserver;
 

Limelight/Input/ControllerSupport.m

@@ -7,121 +7,322 @@
 //
 
 #import "ControllerSupport.h"
+#import "OnScreenControls.h"
+#import "Controller.h"
 #include "Limelight.h"
 
 @import GameController;
 
-@implementation ControllerSupport
+@implementation ControllerSupport {
+    NSLock *_controllerStreamLock;
+    NSMutableDictionary *_controllers;
+    
+    OnScreenControls *_osc;
+    
+    char _controllerNumbers;
+    
+#define EMULATING_SELECT     0x1
+#define EMULATING_SPECIAL    0x2
+}
 
-// UPDATE_BUTTON(flag, pressed)
-#define UPDATE_BUTTON(x, y) (buttonFlags = \
-    (y) ? (buttonFlags | (x)) : (buttonFlags & ~(x)))
+// UPDATE_BUTTON_FLAG(controller, flag, pressed)
+#define UPDATE_BUTTON_FLAG(controller, x, y) \
+((y) ? [self setButtonFlag:controller flags:x] : [self clearButtonFlag:controller flags:x])
 
-static NSLock *controllerStreamLock;
-
-+(void) registerControllerCallbacks
+-(void) updateLeftStick:(Controller*)controller x:(short)x y:(short)y
 {
+    @synchronized(controller) {
+        controller.lastLeftStickX = x;
+        controller.lastLeftStickY = y;
+    }
+}
+
+-(void) updateRightStick:(Controller*)controller x:(short)x y:(short)y
+{
+    @synchronized(controller) {
+        controller.lastRightStickX = x;
+        controller.lastRightStickY = y;
+    }
+}
+
+-(void) updateLeftTrigger:(Controller*)controller left:(char)left
+{
+    @synchronized(controller) {
+        controller.lastLeftTrigger = left;
+    }
+}
+
+-(void) updateRightTrigger:(Controller*)controller right:(char)right
+{
+    @synchronized(controller) {
+        controller.lastRightTrigger = right;
+    }
+}
+
+-(void) updateTriggers:(Controller*) controller left:(char)left right:(char)right
+{
+    @synchronized(controller) {
+        controller.lastLeftTrigger = left;
+        controller.lastRightTrigger = right;
+    }
+}
+
+-(void) handleSpecialCombosReleased:(Controller*)controller releasedButtons:(int)releasedButtons
+{
+    if ((controller.emulatingButtonFlags & EMULATING_SELECT) &&
+        ((releasedButtons & LB_FLAG) || (releasedButtons & PLAY_FLAG))) {
+        controller.lastButtonFlags &= ~BACK_FLAG;
+        controller.emulatingButtonFlags &= ~EMULATING_SELECT;
+    }
+    if ((controller.emulatingButtonFlags & EMULATING_SPECIAL) &&
+        ((releasedButtons & RB_FLAG) || (releasedButtons & PLAY_FLAG) ||
+         (releasedButtons & BACK_FLAG))) {
+            controller.lastButtonFlags &= ~SPECIAL_FLAG;
+            controller.emulatingButtonFlags &= ~EMULATING_SPECIAL;
+        }
+}
+
+-(void) handleSpecialCombosPressed:(Controller*)controller pressedButtons:(int)pressedButtons
+{
+    // Special button combos for select and special
+    if (controller.lastButtonFlags & PLAY_FLAG) {
+        // If LB and start are down, trigger select
+        if (controller.lastButtonFlags & LB_FLAG) {
+            controller.lastButtonFlags |= BACK_FLAG;
+            controller.lastButtonFlags &= ~(pressedButtons & (PLAY_FLAG | LB_FLAG));
+            controller.emulatingButtonFlags |= EMULATING_SELECT;
+        }
+        // If (RB or select) and start are down, trigger special
+        else if ((controller.lastButtonFlags & RB_FLAG) || (controller.lastButtonFlags & BACK_FLAG)) {
+            controller.lastButtonFlags |= SPECIAL_FLAG;
+            controller.lastButtonFlags &= ~(pressedButtons & (PLAY_FLAG | RB_FLAG | BACK_FLAG));
+            controller.emulatingButtonFlags |= EMULATING_SPECIAL;
+        }
+    }
+    
+}
+
+-(void) updateButtonFlags:(Controller*)controller flags:(int)flags
+{
+    @synchronized(controller) {
+        int releasedButtons = (controller.lastButtonFlags ^ flags) & ~flags;
+        int pressedButtons = (controller.lastButtonFlags ^ flags) & flags;
+        
+        controller.lastButtonFlags = flags;
+        
+        // This must be called before handleSpecialCombosPressed
+        // because we clear the original button flags there
+        [self handleSpecialCombosReleased:controller releasedButtons:releasedButtons];
+        
+        [self handleSpecialCombosPressed:controller pressedButtons:pressedButtons];
+        
+    }
+}
+
+-(void) setButtonFlag:(Controller*)controller flags:(int)flags
+{
+    @synchronized(controller) {
+        controller.lastButtonFlags |= flags;
+        [self handleSpecialCombosPressed:controller pressedButtons:flags];
+    }
+}
+
+-(void) clearButtonFlag:(Controller*)controller flags:(int)flags
+{
+    @synchronized(controller) {
+        controller.lastButtonFlags &= ~flags;
+        [self handleSpecialCombosReleased:controller releasedButtons:flags];
+    }
+}
+
+-(void) updateFinished:(Controller*)controller
+{
+    [_controllerStreamLock lock];
+    @synchronized(controller) {
+        LiSendMultiControllerEvent(controller.playerIndex, controller.lastButtonFlags, controller.lastLeftTrigger, controller.lastRightTrigger, controller.lastLeftStickX, controller.lastLeftStickY, controller.lastRightStickX, controller.lastRightStickY);
+    }
+    [_controllerStreamLock unlock];
+}
+
+-(void) unregisterControllerCallbacks:(GCController*) controller
+{
+    if (controller != NULL) {
+        controller.controllerPausedHandler = NULL;
+        
+        if (controller.extendedGamepad != NULL) {
+            controller.extendedGamepad.valueChangedHandler = NULL;
+        }
+        else if (controller.gamepad != NULL) {
+            controller.gamepad.valueChangedHandler = NULL;
+        }
+    }
+}
+
+-(void) registerControllerCallbacks:(GCController*) controller
+{
+    if (controller != NULL) {
+        controller.controllerPausedHandler = ^(GCController *controller) {
+            Controller* limeController = [_controllers objectForKey:[NSNumber numberWithInteger:controller.playerIndex]];
+            [self setButtonFlag:limeController flags:PLAY_FLAG];
+            [self updateFinished:limeController];
+            
+            // Pause for 100 ms
+            usleep(100 * 1000);
+            
+            [self clearButtonFlag:limeController flags:PLAY_FLAG];
+            [self updateFinished:limeController];
+        };
+        
+        if (controller.extendedGamepad != NULL) {
+            controller.extendedGamepad.valueChangedHandler = ^(GCExtendedGamepad *gamepad, GCControllerElement *element) {
+                Controller* limeController = [_controllers objectForKey:[NSNumber numberWithInteger:gamepad.controller.playerIndex]];
+                short leftStickX, leftStickY;
+                short rightStickX, rightStickY;
+                char leftTrigger, rightTrigger;
+                
+                UPDATE_BUTTON_FLAG(limeController, A_FLAG, gamepad.buttonA.pressed);
+                UPDATE_BUTTON_FLAG(limeController, B_FLAG, gamepad.buttonB.pressed);
+                UPDATE_BUTTON_FLAG(limeController, X_FLAG, gamepad.buttonX.pressed);
+                UPDATE_BUTTON_FLAG(limeController, Y_FLAG, gamepad.buttonY.pressed);
+                
+                UPDATE_BUTTON_FLAG(limeController, UP_FLAG, gamepad.dpad.up.pressed);
+                UPDATE_BUTTON_FLAG(limeController, DOWN_FLAG, gamepad.dpad.down.pressed);
+                UPDATE_BUTTON_FLAG(limeController, LEFT_FLAG, gamepad.dpad.left.pressed);
+                UPDATE_BUTTON_FLAG(limeController, RIGHT_FLAG, gamepad.dpad.right.pressed);
+                
+                UPDATE_BUTTON_FLAG(limeController, LB_FLAG, gamepad.leftShoulder.pressed);
+                UPDATE_BUTTON_FLAG(limeController, RB_FLAG, gamepad.rightShoulder.pressed);
+                
+                leftStickX = gamepad.leftThumbstick.xAxis.value * 0x7FFE;
+                leftStickY = gamepad.leftThumbstick.yAxis.value * 0x7FFE;
+                
+                rightStickX = gamepad.rightThumbstick.xAxis.value * 0x7FFE;
+                rightStickY = gamepad.rightThumbstick.yAxis.value * 0x7FFE;
+                
+                leftTrigger = gamepad.leftTrigger.value * 0xFF;
+                rightTrigger = gamepad.rightTrigger.value * 0xFF;
+                
+                [self updateLeftStick:limeController x:leftStickX y:leftStickY];
+                [self updateRightStick:limeController x:rightStickX y:rightStickY];
+                [self updateTriggers:limeController left:leftTrigger right:rightTrigger];
+                [self updateFinished:limeController];
+            };
+        }
+        else if (controller.gamepad != NULL) {
+            controller.gamepad.valueChangedHandler = ^(GCGamepad *gamepad, GCControllerElement *element) {
+                Controller* limeController = [_controllers objectForKey:[NSNumber numberWithInteger:gamepad.controller.playerIndex]];
+                UPDATE_BUTTON_FLAG(limeController, A_FLAG, gamepad.buttonA.pressed);
+                UPDATE_BUTTON_FLAG(limeController, B_FLAG, gamepad.buttonB.pressed);
+                UPDATE_BUTTON_FLAG(limeController, X_FLAG, gamepad.buttonX.pressed);
+                UPDATE_BUTTON_FLAG(limeController, Y_FLAG, gamepad.buttonY.pressed);
+                
+                UPDATE_BUTTON_FLAG(limeController, UP_FLAG, gamepad.dpad.up.pressed);
+                UPDATE_BUTTON_FLAG(limeController, DOWN_FLAG, gamepad.dpad.down.pressed);
+                UPDATE_BUTTON_FLAG(limeController, LEFT_FLAG, gamepad.dpad.left.pressed);
+                UPDATE_BUTTON_FLAG(limeController, RIGHT_FLAG, gamepad.dpad.right.pressed);
+                
+                UPDATE_BUTTON_FLAG(limeController, LB_FLAG, gamepad.leftShoulder.pressed);
+                UPDATE_BUTTON_FLAG(limeController, RB_FLAG, gamepad.rightShoulder.pressed);
+                
+                [self updateFinished:limeController];
+            };
+        }
+    } else {
+        Log(LOG_W, @"Tried to register controller callbacks on NULL controller");
+    }
+}
+
+-(void) updateAutoOnScreenControlMode
+{
+    // Auto on-screen control support may not be enabled
+    if (_osc == NULL) {
+        return;
+    }
+    
+    OnScreenControlsLevel level = OnScreenControlsLevelFull;
+    
+    // We currently stop after the first controller we find.
+    // Maybe we'll want to change that logic later.
     for (int i = 0; i < [[GCController controllers] count]; i++) {
         GCController *controller = [GCController controllers][i];
         
         if (controller != NULL) {
-            printf("Controller connected!\n");
-            controller.controllerPausedHandler = ^(GCController *controller) {
-                // We call LiSendControllerEvent while holding a lock to prevent
-                // multiple simultaneous calls since this function isn't thread safe.
-                [controllerStreamLock lock];
-                LiSendControllerEvent(PLAY_FLAG, 0, 0, 0, 0, 0, 0);
-                
-                // Pause for 100 ms
-                usleep(100 * 1000);
-                
-                LiSendControllerEvent(0, 0, 0, 0, 0, 0, 0);
-                [controllerStreamLock unlock];
-            };
-            
             if (controller.extendedGamepad != NULL) {
-                controller.extendedGamepad.valueChangedHandler = ^(GCExtendedGamepad *gamepad, GCControllerElement *element) {
-                    short buttonFlags = 0;
-                    short leftStickX, leftStickY;
-                    short rightStickX, rightStickY;
-                    char leftTrigger, rightTrigger;
-                    
-                    UPDATE_BUTTON(A_FLAG, gamepad.buttonA.pressed);
-                    UPDATE_BUTTON(B_FLAG, gamepad.buttonB.pressed);
-                    UPDATE_BUTTON(X_FLAG, gamepad.buttonX.pressed);
-                    UPDATE_BUTTON(Y_FLAG, gamepad.buttonY.pressed);
-                    
-                    UPDATE_BUTTON(UP_FLAG, gamepad.dpad.up.pressed);
-                    UPDATE_BUTTON(DOWN_FLAG, gamepad.dpad.down.pressed);
-                    UPDATE_BUTTON(LEFT_FLAG, gamepad.dpad.left.pressed);
-                    UPDATE_BUTTON(RIGHT_FLAG, gamepad.dpad.right.pressed);
-                    
-                    UPDATE_BUTTON(LB_FLAG, gamepad.leftShoulder.pressed);
-                    UPDATE_BUTTON(RB_FLAG, gamepad.rightShoulder.pressed);
-                    
-                    leftStickX = gamepad.leftThumbstick.xAxis.value * 0x7FFE;
-                    leftStickY = gamepad.leftThumbstick.yAxis.value * 0x7FFE;
-                    
-                    rightStickX = gamepad.rightThumbstick.xAxis.value * 0x7FFE;
-                    rightStickY = gamepad.rightThumbstick.yAxis.value * 0x7FFE;
-                    
-                    leftTrigger = gamepad.leftTrigger.value * 0xFF;
-                    rightTrigger = gamepad.rightTrigger.value * 0xFF;
-                    
-                    // We call LiSendControllerEvent while holding a lock to prevent
-                    // multiple simultaneous calls since this function isn't thread safe.
-                    [controllerStreamLock lock];
-                    LiSendControllerEvent(buttonFlags, leftTrigger, rightTrigger,
-                                          leftStickX, leftStickY, rightStickX, rightStickY);
-                    [controllerStreamLock unlock];
-                };
+                level = OnScreenControlsLevelAutoGCExtendedGamepad;
+                break;
             }
             else if (controller.gamepad != NULL) {
-                controller.gamepad.valueChangedHandler = ^(GCGamepad *gamepad, GCControllerElement *element) {
-                    short buttonFlags = 0;
-                    
-                    UPDATE_BUTTON(A_FLAG, gamepad.buttonA.pressed);
-                    UPDATE_BUTTON(B_FLAG, gamepad.buttonB.pressed);
-                    UPDATE_BUTTON(X_FLAG, gamepad.buttonX.pressed);
-                    UPDATE_BUTTON(Y_FLAG, gamepad.buttonY.pressed);
-                    
-                    UPDATE_BUTTON(UP_FLAG, gamepad.dpad.up.pressed);
-                    UPDATE_BUTTON(DOWN_FLAG, gamepad.dpad.down.pressed);
-                    UPDATE_BUTTON(LEFT_FLAG, gamepad.dpad.left.pressed);
-                    UPDATE_BUTTON(RIGHT_FLAG, gamepad.dpad.right.pressed);
-                    
-                    UPDATE_BUTTON(LB_FLAG, gamepad.leftShoulder.pressed);
-                    UPDATE_BUTTON(RB_FLAG, gamepad.rightShoulder.pressed);
-                    
-                    // We call LiSendControllerEvent while holding a lock to prevent
-                    // multiple simultaneous calls since this function isn't thread safe.
-                    [controllerStreamLock lock];
-                    LiSendControllerEvent(buttonFlags, 0, 0, 0, 0, 0, 0);
-                    [controllerStreamLock unlock];
-                };
+                level = OnScreenControlsLevelAutoGCGamepad;
+                break;
             }
         }
     }
+    
+    [_osc setLevel:level];
+}
 
+-(void) initAutoOnScreenControlMode:(OnScreenControls*)osc
+{
+    _osc = osc;
+    
+    [self updateAutoOnScreenControlMode];
+}
+
+-(void) assignController:(GCController*)controller {
+    for (int i = 0; i < 4; i++) {
+        if (!(_controllerNumbers & (1 << i))) {
+            _controllerNumbers |= (1 << i);
+            Controller* limeController = [[Controller alloc] init];
+            controller.playerIndex = i;
+            limeController.playerIndex = i;
+            [_controllers setObject:limeController forKey:[NSNumber numberWithInteger:controller.playerIndex]];
+            
+            Log(LOG_I, @"Assigning controller index: %d", i);
+            break;
+        }
+    }
 }
 
 -(id) init
 {
     self = [super init];
     
-    if (controllerStreamLock == NULL) {
-        controllerStreamLock = [[NSLock alloc] init];
+    _controllerStreamLock = [[NSLock alloc] init];
+    _controllers = [[NSMutableDictionary alloc] init];
+    _controllerNumbers = 0;
+    
+    Log(LOG_I, @"Number of controllers connected: %ld", (long)[[GCController controllers] count]);
+    for (GCController* controller in [GCController controllers]) {
+        [self assignController:controller];
+        [self registerControllerCallbacks:controller];
+        [self updateAutoOnScreenControlMode];
     }
     
     self.connectObserver = [[NSNotificationCenter defaultCenter] addObserverForName:GCControllerDidConnectNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        [ControllerSupport registerControllerCallbacks];
+        Log(LOG_I, @"Controller connected!");
+        
+        GCController* controller = note.object;
+        [self assignController:controller];
+        
+        // Register callbacks on the new controller
+        [self registerControllerCallbacks:controller];
+        
+        // Re-evaluate the on-screen control mode
+        [self updateAutoOnScreenControlMode];
     }];
     self.disconnectObserver = [[NSNotificationCenter defaultCenter] addObserverForName:GCControllerDidDisconnectNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *note) {
-        printf("Controller disconnected!\n");
+        Log(LOG_I, @"Controller disconnected!");
+        
+        GCController* controller = note.object;
+        [self unregisterControllerCallbacks:controller];
+        [_controllers removeObjectForKey:[NSNumber numberWithInteger:controller.playerIndex]];
+        _controllerNumbers &= ~(1 << controller.playerIndex);
+        Log(LOG_I, @"Unassigning controller index: %ld", (long)controller.playerIndex);
+        
+        // Re-evaluate the on-screen control mode
+        [self updateAutoOnScreenControlMode];
     }];
     
-    [ControllerSupport registerControllerCallbacks];
-    
     return self;
 }
 
@@ -129,6 +330,11 @@ static NSLock *controllerStreamLock;
 {
     [[NSNotificationCenter defaultCenter] removeObserver:self.connectObserver];
     [[NSNotificationCenter defaultCenter] removeObserver:self.disconnectObserver];
+    [_controllers removeAllObjects];
+    _controllerNumbers = 0;
+    for (GCController* controller in [GCController controllers]) {
+        [self unregisterControllerCallbacks:controller];
+    }
 }
 
 @end

Limelight/Input/OnScreenControls.h

@@ -0,0 +1,32 @@
+//
+//  OnScreenControls.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 12/28/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+@class ControllerSupport;
+
+@interface OnScreenControls : NSObject
+
+typedef NS_ENUM(NSInteger, OnScreenControlsLevel) {
+    OnScreenControlsLevelOff,
+    OnScreenControlsLevelAuto,
+    OnScreenControlsLevelSimple,
+    OnScreenControlsLevelFull,
+    
+    // Internal levels selected by ControllerSupport
+    OnScreenControlsLevelAutoGCGamepad,
+    OnScreenControlsLevelAutoGCExtendedGamepad,
+};
+
+- (id) initWithView:(UIView*)view controllerSup:(ControllerSupport*)controllerSupport;
+- (BOOL) handleTouchDownEvent:(NSSet*)touches;
+- (BOOL) handleTouchUpEvent:(NSSet*)touches;
+- (BOOL) handleTouchMovedEvent:(NSSet*)touches;
+- (void) setLevel:(OnScreenControlsLevel)level;
+
+@end

Limelight/Input/OnScreenControls.m

@@ -0,0 +1,722 @@
+//
+//  OnScreenControls.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 12/28/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "OnScreenControls.h"
+#import "ControllerSupport.h"
+#import "Controller.h"
+#include "Limelight.h"
+
+#define UPDATE_BUTTON(x, y) (buttonFlags = \
+(y) ? (buttonFlags | (x)) : (buttonFlags & ~(x)))
+
+@implementation OnScreenControls {
+    CALayer* _aButton;
+    CALayer* _bButton;
+    CALayer* _xButton;
+    CALayer* _yButton;
+    CALayer* _upButton;
+    CALayer* _downButton;
+    CALayer* _leftButton;
+    CALayer* _rightButton;
+    CALayer* _leftStickBackground;
+    CALayer* _leftStick;
+    CALayer* _rightStickBackground;
+    CALayer* _rightStick;
+    CALayer* _startButton;
+    CALayer* _selectButton;
+    CALayer* _r1Button;
+    CALayer* _r2Button;
+    CALayer* _r3Button;
+    CALayer* _l1Button;
+    CALayer* _l2Button;
+    CALayer* _l3Button;
+    
+    UITouch* _aTouch;
+    UITouch* _bTouch;
+    UITouch* _xTouch;
+    UITouch* _yTouch;
+    UITouch* _upTouch;
+    UITouch* _downTouch;
+    UITouch* _leftTouch;
+    UITouch* _rightTouch;
+    UITouch* _lsTouch;
+    UITouch* _rsTouch;
+    UITouch* _startTouch;
+    UITouch* _selectTouch;
+    UITouch* _r1Touch;
+    UITouch* _r2Touch;
+    UITouch* _r3Touch;
+    UITouch* _l1Touch;
+    UITouch* _l2Touch;
+    UITouch* _l3Touch;
+    
+    NSDate* l3TouchStart;
+    NSDate* r3TouchStart;
+    
+    BOOL l3Set;
+    BOOL r3Set;
+    
+    UIView* _view;
+    OnScreenControlsLevel _level;
+    
+    ControllerSupport *_controllerSupport;
+    Controller *_controller;
+}
+
+static const float BUTTON_SIZE = 50;
+static const float BUTTON_DIST = 20;
+static float BUTTON_CENTER_X;
+static float BUTTON_CENTER_Y;
+
+static const float D_PAD_SHORT = 50;
+static const float D_PAD_LONG = 65;
+static const float D_PAD_DIST = 15;
+static float D_PAD_CENTER_X;
+static float D_PAD_CENTER_Y;
+
+static const double STICK_CLICK_RATE = 100;
+static const float STICK_INNER_SIZE = 80;
+static const float STICK_OUTER_SIZE = 120;
+static const float STICK_DEAD_ZONE = .1;
+static float LS_CENTER_X;
+static float LS_CENTER_Y;
+static float RS_CENTER_X;
+static float RS_CENTER_Y;
+
+static const float START_WIDTH = 50;
+static const float START_HEIGHT = 30;
+static float START_X;
+static float START_Y;
+
+static const float SELECT_WIDTH = 50;
+static const float SELECT_HEIGHT = 30;
+static float SELECT_X;
+static float SELECT_Y;
+
+static const float BUMPER_SIZE = 45;
+static const float TRIGGER_SIZE = 60;
+static const float L3R3_SIZE = 80;
+
+static float R1_X;
+static float R1_Y;
+static float R2_X;
+static float R2_Y;
+static float R3_X;
+static float R3_Y;
+static float L1_X;
+static float L1_Y;
+static float L2_X;
+static float L2_Y;
+static float L3_X;
+static float L3_Y;
+
+- (id) initWithView:(UIView*)view controllerSup:(ControllerSupport*)controllerSupport {
+    self = [self init];
+    _view = view;
+    _controllerSupport = controllerSupport;
+    _controller = [[Controller alloc] init];
+    _controller.playerIndex = 0;
+    
+    _aButton = [CALayer layer];
+    _bButton = [CALayer layer];
+    _xButton = [CALayer layer];
+    _yButton = [CALayer layer];
+    _upButton = [CALayer layer];
+    _downButton = [CALayer layer];
+    _leftButton = [CALayer layer];
+    _rightButton = [CALayer layer];
+    _l1Button = [CALayer layer];
+    _r1Button = [CALayer layer];
+    _l2Button = [CALayer layer];
+    _r2Button = [CALayer layer];
+    _l3Button = [CALayer layer];
+    _r3Button = [CALayer layer];
+    _startButton = [CALayer layer];
+    _selectButton = [CALayer layer];
+    _leftStickBackground = [CALayer layer];
+    _rightStickBackground = [CALayer layer];
+    _leftStick = [CALayer layer];
+    _rightStick = [CALayer layer];
+
+    return self;
+}
+
+- (void) setLevel:(OnScreenControlsLevel)level {
+    _level = level;
+    [self updateControls];
+}
+
+- (void) updateControls {
+    switch (_level) {
+        case OnScreenControlsLevelOff:
+            [self hideButtons];
+            [self hideBumpers];
+            [self hideTriggers];
+            [self hideStartSelect];
+            [self hideSticks];
+            [self hideL3R3];
+            break;
+        case OnScreenControlsLevelAutoGCGamepad:
+            // GCGamepad is missing triggers, both analog sticks,
+            // and the select button
+            [self setupGamepadControls];
+            
+            [self hideButtons];
+            [self hideBumpers];
+            [self drawTriggers];
+            [self drawStartSelect];
+            [self drawSticks];
+            [self drawL3R3];
+            break;
+        case OnScreenControlsLevelAutoGCExtendedGamepad:
+            // GCExtendedGamepad is missing R3, L3, and select
+            [self setupExtendedGamepadControls];
+            
+            [self hideButtons];
+            [self hideBumpers];
+            [self hideTriggers];
+            [self drawStartSelect];
+            [self hideSticks];
+            [self drawL3R3];
+            break;
+        case OnScreenControlsLevelSimple:
+            [self setupSimpleControls];
+            
+            [self drawTriggers];
+            [self drawStartSelect];
+            [self drawL3R3];
+            [self hideButtons];
+            [self hideBumpers];
+            [self hideSticks];
+            break;
+        case OnScreenControlsLevelFull:
+            [self setupComplexControls];
+            
+            [self drawButtons];
+            [self drawStartSelect];
+            [self drawBumpers];
+            [self drawTriggers];
+            [self drawSticks];
+            [self hideL3R3]; // Full controls don't need these they have the sticks
+            break;
+        default:
+            Log(LOG_W, @"Unknown on-screen controls level: %d", (int)_level);
+            break;
+    }
+}
+
+// For GCExtendedGamepad controls we move start, select, L3, and R3 to the button
+- (void) setupExtendedGamepadControls {
+    // Start with the default complex layout
+    [self setupComplexControls];
+    
+    START_Y = _view.frame.size.height * .9;
+    SELECT_Y = _view.frame.size.height * .9;
+}
+
+// For GCGamepad controls we move triggers, start, and select
+// to sit right above the analog sticks
+- (void) setupGamepadControls {
+    // Start with the default complex layout
+    [self setupComplexControls];
+    
+    // TODO
+}
+
+// For simple controls we move the triggers and buttons to the bottom
+- (void) setupSimpleControls {
+    // Start with the default complex layout
+    [self setupComplexControls];
+    
+    START_Y = _view.frame.size.height * .9;
+    SELECT_Y = _view.frame.size.height * .9;
+
+    L1_Y = _view.frame.size.height * .75;
+    L2_Y = _view.frame.size.height * .9;
+    R1_Y = _view.frame.size.height * .75;
+    R2_Y = _view.frame.size.height * .9;
+}
+
+- (void) setupComplexControls
+{
+    D_PAD_CENTER_X = _view.frame.size.width * .15;
+    D_PAD_CENTER_Y = _view.frame.size.height * .55;
+    BUTTON_CENTER_X = _view.frame.size.width * .85;
+    BUTTON_CENTER_Y = _view.frame.size.height * .55;
+    
+    LS_CENTER_X = _view.frame.size.width * .35;
+    LS_CENTER_Y = _view.frame.size.height * .75;
+    RS_CENTER_X = _view.frame.size.width * .65;
+    RS_CENTER_Y = _view.frame.size.height * .75;
+    
+    START_X = _view.frame.size.width * .55;
+    START_Y = _view.frame.size.height * .1;
+    SELECT_X = _view.frame.size.width * .45;
+    SELECT_Y = _view.frame.size.height * .1;
+    
+    L1_X = _view.frame.size.width * .15;
+    L1_Y = _view.frame.size.height * .25;
+    L2_X = _view.frame.size.width * .15;
+    L2_Y = _view.frame.size.height * .1;
+    R1_X = _view.frame.size.width * .85;
+    R1_Y = _view.frame.size.height * .25;
+    R2_X = _view.frame.size.width * .85;
+    R2_Y = _view.frame.size.height * .1;
+    L3_X = _view.frame.size.width * .25;
+    L3_Y = _view.frame.size.height * .85;
+    R3_X = _view.frame.size.width * .75;
+    R3_Y = _view.frame.size.height * .85;
+}
+
+- (void) drawButtons {
+    // create A button
+    _aButton.contents = (id) [UIImage imageNamed:@"AButton"].CGImage;
+    _aButton.frame = CGRectMake(BUTTON_CENTER_X - BUTTON_SIZE / 2, BUTTON_CENTER_Y + BUTTON_DIST, BUTTON_SIZE, BUTTON_SIZE);
+    [_view.layer addSublayer:_aButton];
+
+    // create B button
+    _bButton.frame = CGRectMake(BUTTON_CENTER_X + BUTTON_DIST, BUTTON_CENTER_Y - BUTTON_SIZE / 2, BUTTON_SIZE, BUTTON_SIZE);
+    _bButton.contents = (id) [UIImage imageNamed:@"BButton"].CGImage;
+    [_view.layer addSublayer:_bButton];
+
+    // create X Button
+    _xButton.frame = CGRectMake(BUTTON_CENTER_X - BUTTON_DIST - BUTTON_SIZE, BUTTON_CENTER_Y - BUTTON_SIZE / 2, BUTTON_SIZE, BUTTON_SIZE);
+    _xButton.contents = (id) [UIImage imageNamed:@"XButton"].CGImage;
+    [_view.layer addSublayer:_xButton];
+
+    // create Y Button
+    _yButton.frame = CGRectMake(BUTTON_CENTER_X - BUTTON_SIZE / 2, BUTTON_CENTER_Y - BUTTON_DIST - BUTTON_SIZE, BUTTON_SIZE, BUTTON_SIZE);
+    _yButton.contents = (id) [UIImage imageNamed:@"YButton"].CGImage;
+    [_view.layer addSublayer:_yButton];
+
+    // create Down button
+    _downButton.frame = CGRectMake(D_PAD_CENTER_X - D_PAD_SHORT / 2, D_PAD_CENTER_Y + D_PAD_DIST, D_PAD_SHORT, D_PAD_LONG);
+    _downButton.contents = (id) [UIImage imageNamed:@"DownButton"].CGImage;
+    [_view.layer addSublayer:_downButton];
+
+    // create Right button
+    _rightButton.frame = CGRectMake(D_PAD_CENTER_X + D_PAD_DIST, D_PAD_CENTER_Y - D_PAD_SHORT / 2, D_PAD_LONG, D_PAD_SHORT);
+    _rightButton.contents = (id) [UIImage imageNamed:@"RightButton"].CGImage;
+    [_view.layer addSublayer:_rightButton];
+
+    // create Up button
+    _upButton.frame = CGRectMake(D_PAD_CENTER_X - D_PAD_SHORT / 2, D_PAD_CENTER_Y - D_PAD_DIST - D_PAD_LONG, D_PAD_SHORT, D_PAD_LONG);
+    _upButton.contents = (id) [UIImage imageNamed:@"UpButton"].CGImage;
+    [_view.layer addSublayer:_upButton];
+
+    // create Left button
+    _leftButton.frame = CGRectMake(D_PAD_CENTER_X - D_PAD_DIST - D_PAD_LONG, D_PAD_CENTER_Y - D_PAD_SHORT / 2, D_PAD_LONG, D_PAD_SHORT);
+    _leftButton.contents = (id) [UIImage imageNamed:@"LeftButton"].CGImage;
+    [_view.layer addSublayer:_leftButton];
+}
+
+- (void) drawStartSelect {
+    // create Start button
+    _startButton.frame = CGRectMake(START_X - START_WIDTH / 2, START_Y - START_HEIGHT / 2, START_WIDTH, START_HEIGHT);
+    _startButton.contents = (id) [UIImage imageNamed:@"StartButton"].CGImage;
+    [_view.layer addSublayer:_startButton];
+
+    // create Select button
+    _selectButton.frame = CGRectMake(SELECT_X - SELECT_WIDTH / 2, SELECT_Y - SELECT_HEIGHT / 2, SELECT_WIDTH, SELECT_HEIGHT);
+    _selectButton.contents = (id) [UIImage imageNamed:@"SelectButton"].CGImage;
+    [_view.layer addSublayer:_selectButton];
+}
+
+- (void) drawBumpers {
+    // create L1 button
+    _l1Button.frame = CGRectMake(L1_X - BUMPER_SIZE / 2, L1_Y - BUMPER_SIZE / 2, BUMPER_SIZE, BUMPER_SIZE);
+    _l1Button.contents = (id) [UIImage imageNamed:@"L1"].CGImage;
+    [_view.layer addSublayer:_l1Button];
+    
+    // create R1 button
+    _r1Button.frame = CGRectMake(R1_X - BUMPER_SIZE / 2, R1_Y - BUMPER_SIZE / 2, BUMPER_SIZE, BUMPER_SIZE);
+    _r1Button.contents = (id) [UIImage imageNamed:@"R1"].CGImage;
+    [_view.layer addSublayer:_r1Button];
+}
+
+- (void) drawTriggers {
+    // create L2 button
+    _l2Button.frame = CGRectMake(L2_X - TRIGGER_SIZE / 2, L2_Y - TRIGGER_SIZE / 2, TRIGGER_SIZE, TRIGGER_SIZE);
+    _l2Button.contents = (id) [UIImage imageNamed:@"L2"].CGImage;
+    [_view.layer addSublayer:_l2Button];
+    
+    // create R2 button
+    _r2Button.frame = CGRectMake(R2_X - TRIGGER_SIZE / 2, R2_Y - TRIGGER_SIZE / 2, TRIGGER_SIZE, TRIGGER_SIZE);
+    _r2Button.contents = (id) [UIImage imageNamed:@"R2"].CGImage;
+    [_view.layer addSublayer:_r2Button];
+}
+
+- (void) drawSticks {
+    // create left analog stick
+    _leftStickBackground.frame = CGRectMake(LS_CENTER_X - STICK_OUTER_SIZE / 2, LS_CENTER_Y - STICK_OUTER_SIZE / 2, STICK_OUTER_SIZE, STICK_OUTER_SIZE);
+    _leftStickBackground.contents = (id) [UIImage imageNamed:@"StickOuter"].CGImage;
+    [_view.layer addSublayer:_leftStickBackground];
+    
+    _leftStick.frame = CGRectMake(LS_CENTER_X - STICK_INNER_SIZE / 2, LS_CENTER_Y - STICK_INNER_SIZE / 2, STICK_INNER_SIZE, STICK_INNER_SIZE);
+    _leftStick.contents = (id) [UIImage imageNamed:@"StickInner"].CGImage;
+    [_view.layer addSublayer:_leftStick];
+
+    // create right analog stick
+    _rightStickBackground.frame = CGRectMake(RS_CENTER_X - STICK_OUTER_SIZE / 2, RS_CENTER_Y - STICK_OUTER_SIZE / 2, STICK_OUTER_SIZE, STICK_OUTER_SIZE);
+    _rightStickBackground.contents = (id) [UIImage imageNamed:@"StickOuter"].CGImage;
+    [_view.layer addSublayer:_rightStickBackground];
+    
+    _rightStick.frame = CGRectMake(RS_CENTER_X - STICK_INNER_SIZE / 2, RS_CENTER_Y - STICK_INNER_SIZE / 2, STICK_INNER_SIZE, STICK_INNER_SIZE);
+    _rightStick.contents = (id) [UIImage imageNamed:@"StickInner"].CGImage;
+    [_view.layer addSublayer:_rightStick];
+}
+
+- (void) drawL3R3 {
+    _l3Button.frame = CGRectMake(L3_X - L3R3_SIZE / 2, L3_Y - L3R3_SIZE / 2, L3R3_SIZE, L3R3_SIZE);
+    _l3Button.contents = (id) [UIImage imageNamed:@"L3"].CGImage;
+    _l3Button.cornerRadius = L3R3_SIZE / 2;
+    _l3Button.borderColor = [UIColor colorWithRed:15.f/255 green:160.f/255 blue:40.f/255 alpha:1.f].CGColor;
+    [_view.layer addSublayer:_l3Button];
+    
+    _r3Button.frame = CGRectMake(R3_X - L3R3_SIZE / 2, R3_Y - L3R3_SIZE / 2, L3R3_SIZE, L3R3_SIZE);
+    _r3Button.contents = (id) [UIImage imageNamed:@"R3"].CGImage;
+    _r3Button.cornerRadius = L3R3_SIZE / 2;
+    _r3Button.borderColor = [UIColor colorWithRed:15.f/255 green:160.f/255 blue:40.f/255 alpha:1.f].CGColor;
+    [_view.layer addSublayer:_r3Button];
+}
+
+- (void) hideButtons {
+    [_aButton removeFromSuperlayer];
+    [_bButton removeFromSuperlayer];
+    [_xButton removeFromSuperlayer];
+    [_yButton removeFromSuperlayer];
+    [_upButton removeFromSuperlayer];
+    [_downButton removeFromSuperlayer];
+    [_leftButton removeFromSuperlayer];
+    [_rightButton removeFromSuperlayer];
+}
+
+- (void) hideStartSelect {
+    [_startButton removeFromSuperlayer];
+    [_selectButton removeFromSuperlayer];
+}
+
+- (void) hideBumpers {
+    [_l1Button removeFromSuperlayer];
+    [_r1Button removeFromSuperlayer];
+}
+
+- (void) hideTriggers {
+    [_l2Button removeFromSuperlayer];
+    [_r2Button removeFromSuperlayer];
+}
+
+- (void) hideSticks {
+    [_leftStickBackground removeFromSuperlayer];
+    [_rightStickBackground removeFromSuperlayer];
+    [_leftStick removeFromSuperlayer];
+    [_rightStick removeFromSuperlayer];
+}
+
+- (void) hideL3R3 {
+    [_l3Button removeFromSuperlayer];
+    [_r3Button removeFromSuperlayer];
+}
+
+- (BOOL) handleTouchMovedEvent:touches {
+    BOOL updated = false;
+    BOOL buttonTouch = false;
+    float rsMaxX = RS_CENTER_X + STICK_OUTER_SIZE / 2;
+    float rsMaxY = RS_CENTER_Y + STICK_OUTER_SIZE / 2;
+    float rsMinX = RS_CENTER_X - STICK_OUTER_SIZE / 2;
+    float rsMinY = RS_CENTER_Y - STICK_OUTER_SIZE / 2;
+    float lsMaxX = LS_CENTER_X + STICK_OUTER_SIZE / 2;
+    float lsMaxY = LS_CENTER_Y + STICK_OUTER_SIZE / 2;
+    float lsMinX = LS_CENTER_X - STICK_OUTER_SIZE / 2;
+    float lsMinY = LS_CENTER_Y - STICK_OUTER_SIZE / 2;
+
+    for (UITouch* touch in touches) {
+        CGPoint touchLocation = [touch locationInView:_view];
+        float xLoc = touchLocation.x;
+        float yLoc = touchLocation.y;
+        if (touch == _lsTouch) {
+            if (xLoc > lsMaxX) xLoc = lsMaxX;
+            if (xLoc < lsMinX) xLoc = lsMinX;
+            if (yLoc > lsMaxY) yLoc = lsMaxY;
+            if (yLoc < lsMinY) yLoc = lsMinY;
+
+            _leftStick.frame = CGRectMake(xLoc - STICK_INNER_SIZE / 2, yLoc - STICK_INNER_SIZE / 2, STICK_INNER_SIZE, STICK_INNER_SIZE);
+
+            float xStickVal = (xLoc - LS_CENTER_X) / (lsMaxX - LS_CENTER_X);
+            float yStickVal = (yLoc - LS_CENTER_Y) / (lsMaxY - LS_CENTER_Y);
+
+            if (fabsf(xStickVal) < STICK_DEAD_ZONE) xStickVal = 0;
+            if (fabsf(yStickVal) < STICK_DEAD_ZONE) yStickVal = 0;
+
+            [_controllerSupport updateLeftStick:_controller x:0x7FFE * xStickVal y:0x7FFE * -yStickVal];
+
+            updated = true;
+        } else if (touch == _rsTouch) {
+            if (xLoc > rsMaxX) xLoc = rsMaxX;
+            if (xLoc < rsMinX) xLoc = rsMinX;
+            if (yLoc > rsMaxY) yLoc = rsMaxY;
+            if (yLoc < rsMinY) yLoc = rsMinY;
+
+            _rightStick.frame = CGRectMake(xLoc - STICK_INNER_SIZE / 2, yLoc - STICK_INNER_SIZE / 2, STICK_INNER_SIZE, STICK_INNER_SIZE);
+
+            float xStickVal = (xLoc - RS_CENTER_X) / (rsMaxX - RS_CENTER_X);
+            float yStickVal = (yLoc - RS_CENTER_Y) / (rsMaxY - RS_CENTER_Y);
+
+            if (fabsf(xStickVal) < STICK_DEAD_ZONE) xStickVal = 0;
+            if (fabsf(yStickVal) < STICK_DEAD_ZONE) yStickVal = 0;
+
+            [_controllerSupport updateRightStick:_controller x:0x7FFE * xStickVal y:0x7FFE * -yStickVal];
+
+            updated = true;
+        } else if (touch == _aTouch) {
+            buttonTouch = true;
+        } else if (touch == _bTouch) {
+            buttonTouch = true;
+        } else if (touch == _xTouch) {
+            buttonTouch = true;
+        } else if (touch == _yTouch) {
+            buttonTouch = true;
+        } else if (touch == _upTouch) {
+            buttonTouch = true;
+        } else if (touch == _downTouch) {
+            buttonTouch = true;
+        } else if (touch == _leftTouch) {
+            buttonTouch = true;
+        } else if (touch == _rightTouch) {
+            buttonTouch = true;
+        } else if (touch == _startTouch) {
+            buttonTouch = true;
+        } else if (touch == _selectTouch) {
+            buttonTouch = true;
+        } else if (touch == _l1Touch) {
+            buttonTouch = true;
+        } else if (touch == _r1Touch) {
+            buttonTouch = true;
+        } else if (touch == _l2Touch) {
+            buttonTouch = true;
+        } else if (touch == _r2Touch) {
+            buttonTouch = true;
+        } else if (touch == _l3Touch) {
+            buttonTouch = true;
+        } else if (touch == _r3Touch) {
+            buttonTouch = true;
+        }
+    }
+    if (updated) {
+        [_controllerSupport updateFinished:_controller];
+    }
+    return updated || buttonTouch;
+}
+
+- (BOOL)handleTouchDownEvent:touches {
+    BOOL updated = false;
+    BOOL stickTouch = false;
+    for (UITouch* touch in touches) {
+        CGPoint touchLocation = [touch locationInView:_view];
+
+        if ([_aButton.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:A_FLAG];
+            _aTouch = touch;
+            updated = true;
+        } else if ([_bButton.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:B_FLAG];
+            _bTouch = touch;
+            updated = true;
+        } else if ([_xButton.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:X_FLAG];
+            _xTouch = touch;
+            updated = true;
+        } else if ([_yButton.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:Y_FLAG];
+            _yTouch = touch;
+            updated = true;
+        } else if ([_upButton.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:UP_FLAG];
+            _upTouch = touch;
+            updated = true;
+        } else if ([_downButton.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:DOWN_FLAG];
+            _downTouch = touch;
+            updated = true;
+        } else if ([_leftButton.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:LEFT_FLAG];
+            _leftTouch = touch;
+            updated = true;
+        } else if ([_rightButton.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:RIGHT_FLAG];
+            _rightTouch = touch;
+            updated = true;
+        } else if ([_startButton.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:PLAY_FLAG];
+            _startTouch = touch;
+            updated = true;
+        } else if ([_selectButton.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:BACK_FLAG];
+            _selectTouch = touch;
+            updated = true;
+        } else if ([_l1Button.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:LB_FLAG];
+            _l1Touch = touch;
+            updated = true;
+        } else if ([_r1Button.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport setButtonFlag:_controller flags:RB_FLAG];
+            _r1Touch = touch;
+            updated = true;
+        } else if ([_l2Button.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport updateLeftTrigger:_controller left:0xFF];
+            _l2Touch = touch;
+            updated = true;
+        } else if ([_r2Button.presentationLayer hitTest:touchLocation]) {
+            [_controllerSupport updateRightTrigger:_controller right:0xFF];
+            _r2Touch = touch;
+            updated = true;
+        } else if ([_l3Button.presentationLayer hitTest:touchLocation]) {
+            if (l3Set) {
+                [_controllerSupport clearButtonFlag:_controller flags:LS_CLK_FLAG];
+                _l3Button.borderWidth = 0.0f;
+            } else {
+                [_controllerSupport setButtonFlag:_controller flags:LS_CLK_FLAG];
+                _l3Button.borderWidth = 2.0f;
+            }
+            l3Set = !l3Set;
+            _l3Touch = touch;
+            updated = true;
+        } else if ([_r3Button.presentationLayer hitTest:touchLocation]) {
+            if (r3Set) {
+                [_controllerSupport clearButtonFlag:_controller flags:RS_CLK_FLAG];
+                _r3Button.borderWidth = 0.0f;
+            } else {
+                [_controllerSupport setButtonFlag:_controller flags:RS_CLK_FLAG];
+                _r3Button.borderWidth = 2.0f;
+            }
+            r3Set = !r3Set;
+            _r3Touch = touch;
+            updated = true;
+        } else if ([_leftStick.presentationLayer hitTest:touchLocation]) {
+            if (l3TouchStart != nil) {
+                // Find elapsed time and convert to milliseconds
+                // Use (-) modifier to conversion since receiver is earlier than now
+                double l3TouchTime = [l3TouchStart timeIntervalSinceNow] * -1000.0;
+                if (l3TouchTime < STICK_CLICK_RATE) {
+                    [_controllerSupport setButtonFlag:_controller flags:LS_CLK_FLAG];
+                    updated = true;
+                }
+            }
+            _lsTouch = touch;
+            stickTouch = true;
+        } else if ([_rightStick.presentationLayer hitTest:touchLocation]) {
+            if (r3TouchStart != nil) {
+                // Find elapsed time and convert to milliseconds
+                // Use (-) modifier to conversion since receiver is earlier than now
+                double r3TouchTime = [r3TouchStart timeIntervalSinceNow] * -1000.0;
+                if (r3TouchTime < STICK_CLICK_RATE) {
+                    [_controllerSupport setButtonFlag:_controller flags:RS_CLK_FLAG];
+                    updated = true;
+                }
+            }
+            _rsTouch = touch;
+            stickTouch = true;
+        }
+    }
+    if (updated) {
+        [_controllerSupport updateFinished:_controller];
+    }
+    return updated || stickTouch;
+}
+
+- (BOOL)handleTouchUpEvent:touches {
+    BOOL updated = false;
+    BOOL touched = false;
+    for (UITouch* touch in touches) {
+        if (touch == _aTouch) {
+            [_controllerSupport clearButtonFlag:_controller flags:A_FLAG];
+            _aTouch = nil;
+            updated = true;
+        } else if (touch == _bTouch) {
+            [_controllerSupport clearButtonFlag:_controller flags:B_FLAG];
+            _bTouch = nil;
+            updated = true;
+        } else if (touch == _xTouch) {
+            [_controllerSupport clearButtonFlag:_controller flags:X_FLAG];
+            _xTouch = nil;
+            updated = true;
+        } else if (touch == _yTouch) {
+            [_controllerSupport clearButtonFlag:_controller flags:Y_FLAG];
+            _yTouch = nil;
+            updated = true;
+        } else if (touch == _upTouch) {
+            [_controllerSupport clearButtonFlag:_controller flags:UP_FLAG];
+            _upTouch = nil;
+            updated = true;
+        } else if (touch == _downTouch) {
+            [_controllerSupport clearButtonFlag:_controller flags:DOWN_FLAG];
+            _downTouch = nil;
+            updated = true;
+        } else if (touch == _leftTouch) {
+            [_controllerSupport clearButtonFlag:_controller flags:LEFT_FLAG];
+            _leftTouch = nil;
+            updated = true;
+        } else if (touch == _rightTouch) {
+            [_controllerSupport clearButtonFlag:_controller flags:RIGHT_FLAG];
+            _rightTouch = nil;
+            updated = true;
+        } else if (touch == _startTouch) {
+            [_controllerSupport clearButtonFlag:_controller flags:PLAY_FLAG];
+            _startTouch = nil;
+            updated = true;
+        } else if (touch == _selectTouch) {
+            [_controllerSupport clearButtonFlag:_controller flags:BACK_FLAG];
+            _selectTouch = nil;
+            updated = true;
+        } else if (touch == _l1Touch) {
+            [_controllerSupport clearButtonFlag:_controller flags:LB_FLAG];
+            _l1Touch = nil;
+            updated = true;
+        } else if (touch == _r1Touch) {
+            [_controllerSupport clearButtonFlag:_controller flags:RB_FLAG];
+            _r1Touch = nil;
+            updated = true;
+        } else if (touch == _l2Touch) {
+            [_controllerSupport updateLeftTrigger:_controller left:0];
+            _l2Touch = nil;
+            updated = true;
+        } else if (touch == _r2Touch) {
+            [_controllerSupport updateRightTrigger:_controller right:0];
+            _r2Touch = nil;
+            updated = true;
+        } else if (touch == _lsTouch) {
+            _leftStick.frame = CGRectMake(LS_CENTER_X - STICK_INNER_SIZE / 2, LS_CENTER_Y - STICK_INNER_SIZE / 2, STICK_INNER_SIZE, STICK_INNER_SIZE);
+            [_controllerSupport updateLeftStick:_controller x:0 y:0];
+            [_controllerSupport clearButtonFlag:_controller flags:LS_CLK_FLAG];
+            l3TouchStart = [NSDate date];
+            _lsTouch = nil;
+            updated = true;
+        } else if (touch == _rsTouch) {
+            _rightStick.frame = CGRectMake(RS_CENTER_X - STICK_INNER_SIZE / 2, RS_CENTER_Y - STICK_INNER_SIZE / 2, STICK_INNER_SIZE, STICK_INNER_SIZE);
+            [_controllerSupport updateRightStick:_controller x:0 y:0];
+            [_controllerSupport clearButtonFlag:_controller flags:RS_CLK_FLAG];
+            r3TouchStart = [NSDate date];
+            _rsTouch = nil;
+            updated = true;
+        }
+        else if (touch == _l3Touch) {
+            _l3Touch = nil;
+            touched = true;
+        }
+        else if (touch == _r3Touch) {
+            _r3Touch = nil;
+            touched = true;
+        }
+    }
+    if (updated) {
+        [_controllerSupport updateFinished:_controller];
+    }
+    return updated || touched;
+}
+
+@end

Limelight/Input/StreamView.h

@@ -7,7 +7,11 @@
 //
 
 #import <UIKit/UIKit.h>
+#import "ControllerSupport.h"
 
 @interface StreamView : UIView
 
+- (void) setupOnScreenControls:(ControllerSupport*)controllerSupport;
+- (void) setMouseDeltaFactors:(float)x y:(float)y;
+
 @end

Limelight/Input/StreamView.m

@@ -8,47 +8,111 @@
 
 #import "StreamView.h"
 #include <Limelight.h>
+#import "OnScreenControls.h"
+#import "DataManager.h"
+#import "ControllerSupport.h"
 
 @implementation StreamView {
     CGPoint touchLocation;
     BOOL touchMoved;
+    OnScreenControls* onScreenControls;
+    
+    float xDeltaFactor;
+    float yDeltaFactor;
+    float screenFactor;
 }
 
-- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
-    UITouch *touch = [[event allTouches] anyObject];
-    touchLocation = [touch locationInView:self];
-    touchMoved = false;
+- (void) setMouseDeltaFactors:(float)x y:(float)y {
+    xDeltaFactor = x;
+    yDeltaFactor = y;
     
-    printf("Touch down\n");
+    screenFactor = [[UIScreen mainScreen] scale];
 }
 
-- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
-    UITouch *touch = [[event allTouches] anyObject];
-    CGPoint currentLocation = [touch locationInView:self];
+- (void) setupOnScreenControls:(ControllerSupport*)controllerSupport {
+    onScreenControls = [[OnScreenControls alloc] initWithView:self controllerSup:controllerSupport];
+    DataManager* dataMan = [[DataManager alloc] init];
+    OnScreenControlsLevel level = (OnScreenControlsLevel)[[dataMan retrieveSettings].onscreenControls integerValue];
     
-    if (touchLocation.x != currentLocation.x ||
-        touchLocation.y != currentLocation.y)
-    {
-        LiSendMouseMoveEvent(currentLocation.x - touchLocation.x,
-                             currentLocation.y - touchLocation.y );
-        
-        touchMoved = true;
-        touchLocation = currentLocation;
+    if (level == OnScreenControlsLevelAuto) {
+        [controllerSupport initAutoOnScreenControlMode:onScreenControls];
+    }
+    else {
+        Log(LOG_I, @"Setting manual on-screen controls level: %d", (int)level);
+        [onScreenControls setLevel:level];
     }
 }
 
-- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
-    printf("Touch up\n");
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
+    Log(LOG_D, @"Touch down");
+    if (![onScreenControls handleTouchDownEvent:touches]) {
+        UITouch *touch = [[event allTouches] anyObject];
+        touchLocation = [touch locationInView:self];
+        touchMoved = false;
+    }
+}
+
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
+    if (![onScreenControls handleTouchMovedEvent:touches]) {
+        if ([[event allTouches] count] == 1) {
+            UITouch *touch = [[event allTouches] anyObject];
+            CGPoint currentLocation = [touch locationInView:self];
+            
+            if (touchLocation.x != currentLocation.x ||
+                touchLocation.y != currentLocation.y)
+            {
+                int deltaX = currentLocation.x - touchLocation.x;
+                int deltaY = currentLocation.y - touchLocation.y;
+                
+                deltaX *= xDeltaFactor * screenFactor;
+                deltaY *= yDeltaFactor * screenFactor;
+                
+                LiSendMouseMoveEvent(deltaX, deltaY);
+
+                touchMoved = true;
+                touchLocation = currentLocation;
+            }
+        } else if ([[event allTouches] count] == 2) {
+            CGPoint firstLocation = [[[[event allTouches] allObjects] objectAtIndex:0] locationInView:self];
+            CGPoint secondLocation = [[[[event allTouches] allObjects] objectAtIndex:1] locationInView:self];
+
+            CGPoint avgLocation = CGPointMake((firstLocation.x + secondLocation.x) / 2, (firstLocation.y + secondLocation.y) / 2);
+            if (touchLocation.y != avgLocation.y) {
+                LiSendScrollEvent(avgLocation.y - touchLocation.y);
+            }
+            touchMoved = true;
+            touchLocation = avgLocation;
+        }
+    }
     
-    if (!touchMoved) {
-        printf("Sending left mouse button press\n");
-        
-        LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
-        
-        // Wait 100 ms to simulate a real button press
-        usleep(100 * 1000);
-        
-        LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+}
+
+- (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
+    Log(LOG_D, @"Touch up");
+    if (![onScreenControls handleTouchUpEvent:touches]) {
+        if (!touchMoved) {
+            if ([[event allTouches] count]  == 2) {
+                Log(LOG_D, @"Sending right mouse button press");
+
+                LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_RIGHT);
+
+                // Wait 100 ms to simulate a real button press
+                usleep(100 * 1000);
+
+                LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_RIGHT);
+
+
+            } else {
+                Log(LOG_D, @"Sending left mouse button press");
+
+                LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_LEFT);
+
+                // Wait 100 ms to simulate a real button press
+                usleep(100 * 1000);
+
+                LiSendMouseButtonEvent(BUTTON_ACTION_RELEASE, BUTTON_LEFT);
+            }
+        }
     }
 }
 

Limelight/Limelight-Info.plist

@@ -9,7 +9,7 @@
 	<key>CFBundleExecutable</key>
 	<string>${EXECUTABLE_NAME}</string>
 	<key>CFBundleIdentifier</key>
-	<string>com.limelight-stream.${PRODUCT_NAME:rfc1034identifier}</string>
+	<string>com.limelight-stream.$(PRODUCT_NAME:rfc1034identifier)</string>
 	<key>CFBundleInfoDictionaryVersion</key>
 	<string>6.0</string>
 	<key>CFBundleName</key>
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.1.0</string>
+	<string>0.4.1</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -26,12 +26,21 @@
 	<string>public.app-category.games</string>
 	<key>LSRequiresIPhoneOS</key>
 	<true/>
+	<key>UIAppFonts</key>
+	<array>
+		<string>Roboto-Black.ttf</string>
+		<string>Roboto-Bold.ttf</string>
+		<string>Roboto-Light.ttf</string>
+		<string>Roboto-Medium.ttf</string>
+		<string>Roboto-Regular.ttf</string>
+		<string>Roboto-Thin.ttf</string>
+	</array>
 	<key>UILaunchStoryboardName</key>
 	<string>Launch Screen</string>
 	<key>UIMainStoryboardFile</key>
-	<string>MainFrame-iPhone</string>
+	<string>iPhone</string>
 	<key>UIMainStoryboardFile~ipad</key>
-	<string>MainFrame-iPad</string>
+	<string>iPad</string>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>
 		<string>armv7</string>
@@ -44,8 +53,6 @@
 	<array>
 		<string>UIInterfaceOrientationLandscapeLeft</string>
 		<string>UIInterfaceOrientationLandscapeRight</string>
-		<string>UIInterfaceOrientationPortrait</string>
-		<string>UIInterfaceOrientationPortraitUpsideDown</string>
 	</array>
 	<key>UISupportedInterfaceOrientations~ipad</key>
 	<array>

Limelight/Limelight-Prefix.pch

@@ -14,4 +14,5 @@
     #import <UIKit/UIKit.h>
     #import <Foundation/Foundation.h>
     #import <CoreData/CoreData.h>
-#endif
+    #import "Logger.h"
+#endif

Limelight/Limelight.xcdatamodeld/.xccurrentversion

@@ -3,6 +3,6 @@
 <plist version="1.0">
 <dict>
 	<key>_XCCurrentVersionName</key>
-	<string>Limelight.xcdatamodel</string>
+	<string>Limelight 0.3.1.xcdatamodel</string>
 </dict>
 </plist>

Limelight/Limelight.xcdatamodeld/Limelight 0.3.0.xcdatamodel/contents

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6254" systemVersion="14C81f" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+    <entity name="Host" representedClassName="Host" syncable="YES">
+        <attribute name="address" attributeType="String" syncable="YES"/>
+        <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="localAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="mac" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="pairState" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="uuid" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="Settings" representedClassName="Settings" syncable="YES">
+        <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" syncable="YES"/>
+        <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" syncable="YES"/>
+        <attribute name="height" attributeType="Integer 32" defaultValueString="720" syncable="YES"/>
+        <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="2" syncable="YES"/>
+        <attribute name="width" attributeType="Integer 32" defaultValueString="1280" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Host" positionX="0" positionY="0" width="128" height="148"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="120"/>
+    </elements>
+</model>

Limelight/Limelight.xcdatamodeld/Limelight 0.3.1.xcdatamodel/contents

@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6254" systemVersion="14C81f" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+    <entity name="Host" representedClassName="Host" syncable="YES">
+        <attribute name="address" attributeType="String" syncable="YES"/>
+        <attribute name="externalAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="localAddress" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="mac" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="name" attributeType="String" syncable="YES"/>
+        <attribute name="pairState" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="uuid" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="Settings" representedClassName="Settings" syncable="YES">
+        <attribute name="bitrate" attributeType="Integer 32" defaultValueString="10000" syncable="YES"/>
+        <attribute name="framerate" attributeType="Integer 32" defaultValueString="60" syncable="YES"/>
+        <attribute name="height" attributeType="Integer 32" defaultValueString="720" syncable="YES"/>
+        <attribute name="onscreenControls" attributeType="Integer 32" defaultValueString="1" syncable="YES"/>
+        <attribute name="width" attributeType="Integer 32" defaultValueString="1280" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Host" positionX="0" positionY="0" width="128" height="148"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="120"/>
+    </elements>
+</model>

Limelight/Limelight.xcdatamodeld/Limelight.xcdatamodel/contents

@@ -1,4 +1,17 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<model name="Test1.xcdatamodel" userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="1" systemVersion="11A491" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
-    <elements/>
+<model userDefinedModelVersionIdentifier="" type="com.apple.IDECoreDataModeler.DataModel" documentVersion="1.0" lastSavedToolsVersion="6254" systemVersion="14C81f" minimumToolsVersion="Automatic" macOSVersion="Automatic" iOSVersion="Automatic">
+    <entity name="Host" representedClassName="Host" syncable="YES">
+        <attribute name="address" optional="YES" attributeType="String" syncable="YES"/>
+        <attribute name="name" optional="YES" attributeType="String" syncable="YES"/>
+    </entity>
+    <entity name="Settings" representedClassName="Settings" syncable="YES">
+        <attribute name="bitrate" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="framerate" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="height" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+        <attribute name="width" optional="YES" attributeType="Integer 32" defaultValueString="0" syncable="YES"/>
+    </entity>
+    <elements>
+        <element name="Host" positionX="0" positionY="0" width="128" height="75"/>
+        <element name="Settings" positionX="0" positionY="0" width="128" height="105"/>
+    </elements>
 </model>

Limelight/Network/AppAssetManager.h

@@ -0,0 +1,26 @@
+//
+//  AppManager.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/25/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "App.h"
+#import "HttpManager.h"
+#import "Host.h"
+
+@protocol AppAssetCallback <NSObject>
+
+- (void) receivedAssetForApp:(App*)app;
+
+@end
+
+@interface AppAssetManager : NSObject
+
+- (id) initWithCallback:(id<AppAssetCallback>)callback;
+- (void) retrieveAssets:(NSArray*)appList fromHost:(Host*)host;
+- (void) stopRetrieving;
+
+@end

Limelight/Network/AppAssetManager.m

@@ -0,0 +1,58 @@
+//
+//  AppManager.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/25/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "AppAssetManager.h"
+#import "CryptoManager.h"
+#import "Utils.h"
+#import "HttpResponse.h"
+#import "AppAssetRetriever.h"
+
+@implementation AppAssetManager {
+    NSOperationQueue* _opQueue;
+    id<AppAssetCallback> _callback;
+    Host* _host;
+    NSMutableDictionary* _imageCache;
+}
+
+- (id) initWithCallback:(id<AppAssetCallback>)callback {
+    self = [super init];
+    _callback = callback;
+    _opQueue = [[NSOperationQueue alloc] init];
+    _imageCache = [[NSMutableDictionary alloc] init];
+
+    return self;
+}
+
+- (void) retrieveAssets:(NSArray*)appList fromHost:(Host*)host {
+    Host* oldHost = _host;
+    _host = host;
+    BOOL useCache = [oldHost.uuid isEqualToString:_host.uuid];
+    Log(LOG_I, @"Using cached app images: %d", useCache);
+    if (!useCache) {
+        [_imageCache removeAllObjects];
+    }
+    for (App* app in appList) {
+        AppAssetRetriever* retriever = [[AppAssetRetriever alloc] init];
+        retriever.app = app;
+        retriever.host = _host;
+        retriever.callback = _callback;
+        retriever.cache = _imageCache;
+        retriever.useCache = useCache;
+        [_opQueue addOperation:retriever];
+    }
+}
+
+- (void) stopRetrieving {
+    [_opQueue cancelAllOperations];
+}
+
+- (void) sendCallBackForApp:(App*)app {
+    [_callback receivedAssetForApp:app];
+}
+
+@end

Limelight/Network/AppAssetResponse.h

@@ -0,0 +1,16 @@
+//
+//  AppAssetResponse.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "HttpResponse.h"
+
+@interface AppAssetResponse : NSObject <Response>
+
+
+
+@end

Limelight/Network/AppAssetResponse.m

@@ -0,0 +1,25 @@
+//
+//  AppAssetResponse.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "AppAssetResponse.h"
+
+@implementation AppAssetResponse
+@synthesize data, statusCode, statusMessage;
+
+- (void)populateWithData:(NSData *)imageData {
+    self.data = imageData;
+    self.statusMessage = @"App asset has no status message";
+    self.statusCode = -1;
+}
+
+- (UIImage*) getImage {
+    UIImage* appImage = [[UIImage alloc] initWithData:self.data];
+    return appImage;
+}
+
+@end

Limelight/Network/AppAssetRetriever.h

@@ -0,0 +1,22 @@
+//
+//  AppAssetRetriever.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 1/31/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Host.h"
+#import "App.h"
+#import "AppAssetManager.h"
+
+@interface AppAssetRetriever : NSOperation
+
+@property (nonatomic) Host* host;
+@property (nonatomic) App* app;
+@property (nonatomic) NSMutableDictionary* cache;
+@property (nonatomic) id<AppAssetCallback> callback;
+@property (nonatomic) BOOL useCache;
+
+@end

Limelight/Network/AppAssetRetriever.m

@@ -0,0 +1,56 @@
+//
+//  AppAssetRetriever.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 1/31/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "AppAssetRetriever.h"
+#import "HttpManager.h"
+#import "CryptoManager.h"
+#import "AppAssetResponse.h"
+#import "HttpRequest.h"
+
+@implementation AppAssetRetriever
+static const double RETRY_DELAY = 2; // seconds
+static const int MAX_ATTEMPTS = 5;
+
+
+- (void) main {
+    UIImage* appImage = nil;
+    int attempts = 0;
+    while (![self isCancelled] && appImage == nil && attempts++ < MAX_ATTEMPTS) {
+        if (self.useCache) {
+            @synchronized(self.cache) {
+                UIImage* cachedImage = [self.cache objectForKey:self.app.appId];
+                if (cachedImage != nil) {
+                    appImage = cachedImage;
+                    self.app.appImage = appImage;
+                }
+            }
+        }
+        if (appImage == nil) {
+            HttpManager* hMan = [[HttpManager alloc] initWithHost:_host.address uniqueId:[CryptoManager getUniqueID] deviceName:deviceName cert:[CryptoManager readCertFromFile]];
+            AppAssetResponse* appAssetResp = [[AppAssetResponse alloc] init];
+            [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appAssetResp withUrlRequest:[hMan newAppAssetRequestWithAppId:self.app.appId]]];
+            
+            appImage = [UIImage imageWithData:appAssetResp.data];
+            self.app.appImage = appImage;
+            if (appImage != nil) {
+                @synchronized(self.cache) {
+                    [self.cache setObject:appImage forKey:self.app.appId];
+                }
+            }
+        }
+
+        [NSThread sleepForTimeInterval:RETRY_DELAY];
+    }
+    [self performSelectorOnMainThread:@selector(sendCallbackForApp:) withObject:self.app waitUntilDone:NO];
+}
+
+- (void) sendCallbackForApp:(App*)app {
+    [self.callback receivedAssetForApp:app];
+}
+
+@end

Limelight/Network/AppListResponse.h

@@ -0,0 +1,17 @@
+//
+//  AppListResponse.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "HttpResponse.h"
+
+@interface AppListResponse : NSObject <Response>
+
+- (void)populateWithData:(NSData *)data;
+- (NSArray*) getAppList;
+- (BOOL) isStatusOk;
+
+@end

Limelight/Network/AppListResponse.m

@@ -0,0 +1,118 @@
+//
+//  AppListResponse.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "AppListResponse.h"
+#import "App.h"
+#import <libxml2/libxml/xmlreader.h>
+
+@implementation AppListResponse {
+    NSMutableArray* _appList;
+}
+@synthesize data, statusCode, statusMessage;
+
+static const char* TAG_APP = "App";
+static const char* TAG_APP_TITLE = "AppTitle";
+static const char* TAG_APP_ID = "ID";
+static const char* TAG_APP_IS_RUNNING = "IsRunning";
+
+- (void)populateWithData:(NSData *)xml {
+    self.data = xml;
+    _appList = [[NSMutableArray alloc] init];
+    [self parseData];
+}
+
+- (void) parseData {
+    xmlDocPtr docPtr = xmlParseMemory([self.data bytes], (int)[self.data length]);
+    if (docPtr == NULL) {
+        Log(LOG_W, @"An error occured trying to parse xml.");
+        return;
+    }
+    
+    xmlNodePtr node = xmlDocGetRootElement(docPtr);
+    if (node == NULL) {
+        Log(LOG_W, @"No root XML element.");
+        xmlFreeDoc(docPtr);
+        return;
+    }
+    
+    xmlChar* statusStr = xmlGetProp(node, (const xmlChar*)[TAG_STATUS_CODE UTF8String]);
+    if (statusStr != NULL) {
+        int status = [[NSString stringWithUTF8String:(const char*)statusStr] intValue];
+        xmlFree(statusStr);
+        self.statusCode = status;
+    }
+    
+    xmlChar* statusMsgXml = xmlGetProp(node, (const xmlChar*)[TAG_STATUS_MESSAGE UTF8String]);
+    NSString* statusMsg;
+    if (statusMsgXml != NULL) {
+        statusMsg = [NSString stringWithUTF8String:(const char*)statusMsgXml];
+        xmlFree(statusMsgXml);
+    }
+    else {
+        statusMsg = @"Server Error";
+    }
+    self.statusMessage = statusMsg;
+    
+    node = node->children;
+    
+    while (node != NULL) {
+        //Log(LOG_D, @"node: %s", node->name);
+        if (!xmlStrcmp(node->name, (xmlChar*)TAG_APP)) {
+            xmlNodePtr appInfoNode = node->xmlChildrenNode;
+            NSString* appName;
+            NSString* appId;
+            BOOL appIsRunning = NO;
+            while (appInfoNode != NULL) {
+                if (!xmlStrcmp(appInfoNode->name, (xmlChar*)TAG_APP_TITLE)) {
+                    xmlChar* nodeVal = xmlNodeListGetString(docPtr, appInfoNode->xmlChildrenNode, 1);
+                    if (nodeVal != NULL) {
+                        appName = [[NSString alloc] initWithCString:(const char*)nodeVal encoding:NSUTF8StringEncoding];
+                        xmlFree(nodeVal);
+                    } else {
+                        appName = @"";
+                    }
+                } else if (!xmlStrcmp(appInfoNode->name, (xmlChar*)TAG_APP_ID)) {
+                    xmlChar* nodeVal = xmlNodeListGetString(docPtr, appInfoNode->xmlChildrenNode, 1);
+                    if (nodeVal != NULL) {
+                        appId = [[NSString alloc] initWithCString:(const char*)nodeVal encoding:NSUTF8StringEncoding];
+                        xmlFree(nodeVal);
+                    }
+                } else if (!xmlStrcmp(appInfoNode->name, (xmlChar*)TAG_APP_IS_RUNNING)) {
+                    xmlChar* nodeVal = xmlNodeListGetString(docPtr, appInfoNode->xmlChildrenNode, 1);
+                    if (nodeVal != NULL) {
+                        appIsRunning = [[[NSString alloc] initWithCString:(const char*)nodeVal encoding:NSUTF8StringEncoding] isEqualToString:@"1"];
+                        xmlFree(nodeVal);
+                    } else {
+                        appIsRunning = NO;
+                    }
+                }
+                appInfoNode = appInfoNode->next;
+            }
+            App* app = [[App alloc] init];
+            app.appName = appName;
+            app.appId = appId;
+            app.isRunning = appIsRunning;
+            if (app.appId != nil) {
+                [_appList addObject:app];
+            }
+        }
+        node = node->next;
+    }
+    
+    xmlFreeDoc(docPtr);
+}
+
+- (NSArray*) getAppList {
+    return _appList;
+}
+
+- (BOOL) isStatusOk {
+    return self.statusCode == 200;
+}
+
+@end

Limelight/Network/DiscoveryManager.h

@@ -0,0 +1,29 @@
+//
+//  DiscoveryManager.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 1/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "MDNSManager.h"
+#import "Host.h"
+
+@protocol DiscoveryCallback <NSObject>
+
+- (void) updateAllHosts:(NSArray*)hosts;
+
+@end
+
+@interface DiscoveryManager : NSObject <MDNSCallback>
+
+- (id) initWithHosts:(NSArray*)hosts andCallback:(id<DiscoveryCallback>) callback;
+- (void) startDiscovery;
+- (void) stopDiscovery;
+- (void) stopDiscoveryBlocking;
+- (BOOL) addHostToDiscovery:(Host*)host;
+- (void) removeHostFromDiscovery:(Host*)host;
+- (void) discoverHost:(NSString*)hostAddress withCallback:(void (^)(Host*, NSString*))callback;
+
+@end

Limelight/Network/DiscoveryManager.m

@@ -0,0 +1,146 @@
+//
+//  DiscoveryManager.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 1/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "DiscoveryManager.h"
+#import "CryptoManager.h"
+#import "HttpManager.h"
+#import "Utils.h"
+#import "DataManager.h"
+#import "DiscoveryWorker.h"
+#import "ServerInfoResponse.h"
+
+@implementation DiscoveryManager {
+    NSMutableArray* _hostQueue;
+    NSMutableArray* _discoveredHosts;
+    id<DiscoveryCallback> _callback;
+    MDNSManager* _mdnsMan;
+    NSOperationQueue* _opQueue;
+    NSString* _uniqueId;
+    NSData* _cert;
+    BOOL shouldDiscover;
+}
+
+- (id)initWithHosts:(NSArray *)hosts andCallback:(id<DiscoveryCallback>)callback {
+    self = [super init];
+    _hostQueue = [NSMutableArray arrayWithArray:hosts];
+    _callback = callback;
+    _opQueue = [[NSOperationQueue alloc] init];
+    _mdnsMan = [[MDNSManager alloc] initWithCallback:self];
+    [CryptoManager generateKeyPairUsingSSl];
+    _uniqueId = [CryptoManager getUniqueID];
+    _cert = [CryptoManager readCertFromFile];
+    shouldDiscover = NO;
+    return self;
+}
+
+- (void) discoverHost:(NSString *)hostAddress withCallback:(void (^)(Host *, NSString*))callback {
+    HttpManager* hMan = [[HttpManager alloc] initWithHost:hostAddress uniqueId:_uniqueId deviceName:deviceName cert:_cert];
+    ServerInfoResponse* serverInfoResponse = [[ServerInfoResponse alloc] init];
+    [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResponse withUrlRequest:[hMan newServerInfoRequest]]];
+    
+    Host* host = nil;
+    if ([serverInfoResponse isStatusOk]) {
+        DataManager* dataMan = [[DataManager alloc] init];
+        host = [dataMan createHost];
+        host.address = hostAddress;
+        host.online = YES;
+        [serverInfoResponse populateHost:host];
+        if (![self addHostToDiscovery:host]) {
+            [dataMan removeHost:host];
+            callback(nil, @"Host already added");
+        } else {
+            callback(host, nil);
+        }
+    } else {
+        callback(nil, @"Could not connect to host");
+    }
+    
+}
+
+- (void) startDiscovery {
+    Log(LOG_I, @"Starting discovery");
+    shouldDiscover = YES;
+    [_mdnsMan searchForHosts];
+    for (Host* host in _hostQueue) {
+        [_opQueue addOperation:[self createWorkerForHost:host]];
+    }
+}
+
+- (void) stopDiscovery {
+    Log(LOG_I, @"Stopping discovery");
+    shouldDiscover = NO;
+    [_mdnsMan stopSearching];
+    [_opQueue cancelAllOperations];
+}
+
+- (void) stopDiscoveryBlocking {
+    Log(LOG_I, @"Stopping discovery and waiting for workers to stop");
+    shouldDiscover = NO;
+    [_mdnsMan stopSearching];
+    [_opQueue cancelAllOperations];
+    [_opQueue waitUntilAllOperationsAreFinished];
+    Log(LOG_I, @"All discovery workers stopped");
+}
+
+- (BOOL) addHostToDiscovery:(Host *)host {
+    if (![self isHostInDiscovery:host]) {
+        [_hostQueue addObject:host];
+        if (shouldDiscover) {
+            [_opQueue addOperation:[self createWorkerForHost:host]];
+        }
+        return YES;
+    }
+    return NO;
+}
+
+- (void) removeHostFromDiscovery:(Host *)host {
+    for (DiscoveryWorker* worker in [_opQueue operations]) {
+        if ([worker getHost] == host) {
+            [worker cancel];
+        }
+    }
+    [_hostQueue removeObject:host];
+}
+
+// Override from MDNSCallback
+- (void)updateHosts:(NSArray *)hosts {
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        DataManager* dataMan = [[DataManager alloc] init];
+        // Discover the hosts before adding to eliminate duplicates
+        for (Host* host in hosts) {
+            Log(LOG_I, @"Found host through MDNS: %@:", host.name);
+            // Since this is on a background thread, we do not need to use the opQueue
+            DiscoveryWorker* worker = (DiscoveryWorker*)[self createWorkerForHost:host];
+            [worker discoverHost];
+            if ([self addHostToDiscovery:host]) {
+                Log(LOG_I, @"Adding host to discovery: %@", host.name);
+                [_callback updateAllHosts:_hostQueue];
+            } else {
+                Log(LOG_I, @"Not adding host to discovery: %@", host.name);
+                [dataMan removeHost:host];
+            }
+        }
+    });
+}
+
+- (BOOL) isHostInDiscovery:(Host*)host {
+    for (int i = 0; i < _hostQueue.count; i++) {
+        Host* discoveredHost = [_hostQueue objectAtIndex:i];
+        if (discoveredHost.uuid.length > 0 && [discoveredHost.uuid isEqualToString:host.uuid]) {
+            return YES;
+        }
+    }
+    return NO;
+}
+
+- (NSOperation*) createWorkerForHost:(Host*)host {
+    DiscoveryWorker* worker = [[DiscoveryWorker alloc] initWithHost:host uniqueId:_uniqueId cert:_cert];
+    return worker;
+}
+
+@end

Limelight/Network/DiscoveryWorker.h

@@ -0,0 +1,18 @@
+//
+//  DiscoveryWorker.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 1/2/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Host.h"
+
+@interface DiscoveryWorker : NSOperation
+
+- (id) initWithHost:(Host*)host uniqueId:(NSString*)uniqueId cert:(NSData*)cert;
+- (void) discoverHost;
+- (Host*) getHost;
+
+@end

Limelight/Network/DiscoveryWorker.m

@@ -0,0 +1,88 @@
+//
+//  DiscoveryWorker.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 1/2/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "DiscoveryWorker.h"
+#import "Utils.h"
+#import "HttpManager.h"
+#import "ServerInfoResponse.h"
+#import "HttpRequest.h"
+
+@implementation DiscoveryWorker {
+    Host* _host;
+    NSString* _uniqueId;
+    NSData* _cert;
+}
+
+static const float POLL_RATE = 2.0f; // Poll every 2 seconds
+
+- (id) initWithHost:(Host*)host uniqueId:(NSString*)uniqueId cert:(NSData*)cert {
+    self = [super init];
+    _host = host;
+    _uniqueId = uniqueId;
+    _cert = cert;
+    return self;
+}
+
+- (Host*) getHost {
+    return _host;
+}
+
+- (void)main {
+    while (!self.cancelled) {
+        [self discoverHost];
+        if (!self.cancelled) {
+            [NSThread sleepForTimeInterval:POLL_RATE];
+        }
+    }
+}
+
+- (void) discoverHost {
+    BOOL receivedResponse = NO;
+    if (!self.cancelled && _host.localAddress != nil) {
+        ServerInfoResponse* serverInfoResp = [self requestInfoAtAddress:_host.localAddress];
+        receivedResponse = [self checkResponse:serverInfoResp];
+    }
+    if (!self.cancelled && !receivedResponse && _host.externalAddress != nil) {
+        ServerInfoResponse* serverInfoResp = [self requestInfoAtAddress:_host.externalAddress];
+        receivedResponse = [self checkResponse:serverInfoResp];
+    }
+    if (!self.cancelled && !receivedResponse && _host.address != nil) {
+        ServerInfoResponse* serverInfoResp = [self requestInfoAtAddress:_host.address];
+        receivedResponse = [self checkResponse:serverInfoResp];
+    }
+    _host.online = receivedResponse;
+    if (receivedResponse) {
+        Log(LOG_D, @"Received response from: %@\n{\n\t address:%@ \n\t localAddress:%@ \n\t externalAddress:%@ \n\t uuid:%@ \n\t mac:%@ \n\t pairState:%d \n\t online:%d \n}", _host.name, _host.address, _host.localAddress, _host.externalAddress, _host.uuid, _host.mac, _host.pairState, _host.online);
+    }
+}
+
+- (ServerInfoResponse*) requestInfoAtAddress:(NSString*)address {
+    HttpManager* hMan = [[HttpManager alloc] initWithHost:address
+                                                 uniqueId:_uniqueId
+                                               deviceName:deviceName
+                                                     cert:_cert];
+    ServerInfoResponse* response = [[ServerInfoResponse alloc] init];
+    [hMan executeRequestSynchronously:[HttpRequest requestForResponse:response
+                                                       withUrlRequest:[hMan newServerInfoRequest]]];
+    return response;
+}
+
+- (BOOL) checkResponse:(ServerInfoResponse*)response {
+    if ([response isStatusOk]) {
+        // If the response is from a different host then do not update this host
+        if ((_host.uuid == nil || [[response getStringTag:TAG_UNIQUE_ID] isEqualToString:_host.uuid])) {
+            [response populateHost:_host];
+            return YES;
+        } else {
+            Log(LOG_I, @"Received response from incorrect host: %@ expected: %@", [response getStringTag:TAG_UNIQUE_ID], _host.uuid);
+        }
+    }
+    return NO;
+}
+
+@end

Limelight/Network/HttpManager.h

@@ -7,11 +7,12 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "Host.h"
+#import "HttpResponse.h"
+#import "HttpRequest.h"
 
 @interface HttpManager : NSObject <NSURLConnectionDelegate, NSURLConnectionDataDelegate>
 
-+ (NSString*) getStringFromXML:(NSData*)xml tag:(NSString*)tag;
-
 - (id) initWithHost:(NSString*) host uniqueId:(NSString*) uniqueId deviceName:(NSString*) deviceName cert:(NSData*) cert;
 - (NSURLRequest*) newPairRequest:(NSData*)salt;
 - (NSURLRequest*) newUnpairRequest;
@@ -23,7 +24,11 @@
 - (NSURLRequest*) newServerInfoRequest;
 - (NSURLRequest*) newLaunchRequest:(NSString*)appId width:(int)width height:(int)height refreshRate:(int)refreshRate rikey:(NSString*)rikey rikeyid:(int)rikeyid;
 - (NSURLRequest*) newResumeRequestWithRiKey:(NSString*)riKey riKeyId:(int)riKeyId;
-- (NSData*) executeRequestSynchronously:(NSURLRequest*)request;
+- (NSURLRequest*) newQuitAppRequest;
+- (NSURLRequest*) newAppAssetRequestWithAppId:(NSString*)appId;
+- (void) executeRequestSynchronously:(HttpRequest*)request;
+- (void) executeRequest:(HttpRequest*)request;
+
 @end
 
 

Limelight/Network/HttpManager.m

@@ -7,7 +7,9 @@
 //
 
 #import "HttpManager.h"
+#import "HttpRequest.h"
 #import "CryptoManager.h"
+#import "App.h"
 
 #include <libxml2/libxml/xmlreader.h>
 #include <string.h>
@@ -25,53 +27,11 @@
 
 static const NSString* PORT = @"47984";
 
-+ (NSString*) getStringFromXML:(NSData*)xml tag:(NSString*)tag {
-    xmlDocPtr docPtr = xmlParseMemory([xml bytes], (int)[xml length]);
-    
-    if (docPtr == NULL) {
-        NSLog(@"ERROR: An error occured trying to parse xml.");
-        return NULL;
-    }
-    NSString* value;
-    xmlNodePtr node;
-    xmlNodePtr rootNode = node = xmlDocGetRootElement(docPtr);
-    
-    // Check root status_code
-    if (![HttpManager verifyStatus: rootNode]) {
-        //TODO: handle error
-    }
-    
-    // Skip the root node
-    node = node->children;
-    
-    while (node != NULL) {
-        //NSLog(@"node: %s", node->name);
-        if (!xmlStrcmp(node->name, (const xmlChar*)[tag UTF8String])) {
-            xmlChar* nodeVal = xmlNodeListGetString(docPtr, node->xmlChildrenNode, 1);
-            value = [[NSString alloc] initWithCString:(const char*)nodeVal encoding:NSUTF8StringEncoding];
-            xmlFree(nodeVal);
-        }
-        node = node->next;
-    }
-    //NSLog(@"xmlValue: %@", value);
-    xmlFree(rootNode);
-    xmlFree(docPtr);
-    
-    return value;
-}
-
-+ (bool) verifyStatus:(xmlNodePtr)docRoot {
-    xmlChar* statusStr = xmlGetProp(docRoot, (const xmlChar*)"status_code");
-    NSLog(@"status: %s", statusStr);
-    int status = [[NSString stringWithUTF8String:(const char*)statusStr] intValue];
-    xmlFree(statusStr);
-    return status == 200;
-}
-
 + (NSData*) fixXmlVersion:(NSData*) xmlData {
-    NSString* xmlString = [[[NSString alloc] initWithData:xmlData encoding:NSUTF8StringEncoding] stringByReplacingOccurrencesOfString:@"UTF-16" withString:@"UTF-8" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [xmlData length])];
-    //NSLog(@"xmlString: %@", xmlString);
-    return [NSData dataWithBytes:[xmlString UTF8String] length:[xmlString length]];
+    NSString* dataString = [[NSString alloc] initWithData:xmlData encoding:NSUTF8StringEncoding];
+    NSString* xmlString = [dataString stringByReplacingOccurrencesOfString:@"UTF-16" withString:@"UTF-8" options:NSCaseInsensitiveSearch range:NSMakeRange(0, [dataString length])];
+    
+    return [xmlString dataUsingEncoding:NSUTF8StringEncoding];
 }
 
 - (id) initWithHost:(NSString*) host uniqueId:(NSString*) uniqueId deviceName:(NSString*) deviceName cert:(NSData*) cert {
@@ -87,77 +47,101 @@ static const NSString* PORT = @"47984";
     return self;
 }
 
-- (NSData*) executeRequestSynchronously:(NSURLRequest*)request {
-    NSLog(@"Making Request: %@", request);
+- (void) executeRequestSynchronously:(HttpRequest*)request {
+    Log(LOG_D, @"Making Request: %@", request);
     [_respData setLength:0];
     dispatch_sync(dispatch_get_main_queue(), ^{
-        [NSURLConnection connectionWithRequest:request delegate:self];
+        [NSURLConnection connectionWithRequest:request.request delegate:self];
     });
     dispatch_semaphore_wait(_requestLock, DISPATCH_TIME_FOREVER);
-    return _requestResp;
+    if (request.response) {
+        [request.response populateWithData:_requestResp];
+    }
 }
 
-- (void) executeRequest:(NSURLRequest*)request {
-    [NSURLConnection connectionWithRequest:request delegate:self];
+- (void) executeRequest:(HttpRequest*)request {
+    [NSURLConnection connectionWithRequest:request.request delegate:self];
 }
 
-- (NSURLRequest*) createRequestFromString:(NSString*) urlString {
+- (NSURLRequest*) createRequestFromString:(NSString*) urlString enableTimeout:(BOOL)normalTimeout {
     NSString* escapedUrl = [urlString stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
     NSURL* url = [[NSURL alloc] initWithString:escapedUrl];
-    return [NSURLRequest requestWithURL:url];
+    NSMutableURLRequest* request = [NSMutableURLRequest requestWithURL:url];
+    if (normalTimeout) {
+        // Timeout the request after 5 seconds
+        [request setTimeoutInterval:5];
+    }
+    else {
+        // Timeout the request after 60 seconds
+        [request setTimeoutInterval:60];
+    }
+    return request;
 }
 
 - (NSURLRequest*) newPairRequest:(NSData*)salt {
     NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&phrase=getservercert&salt=%@&clientcert=%@",
                            _baseURL, _uniqueId, _deviceName, [self bytesToHex:salt], [self bytesToHex:_cert]];
-    return [self createRequestFromString:urlString];
+    // This call blocks while waiting for the user to input the PIN on the PC
+    return [self createRequestFromString:urlString enableTimeout:FALSE];
 }
 
 - (NSURLRequest*) newUnpairRequest {
     NSString* urlString = [NSString stringWithFormat:@"%@/unpair?uniqueid=%@", _baseURL, _uniqueId];
-    return [self createRequestFromString:urlString];
+    return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest*) newChallengeRequest:(NSData*)challenge {
     NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&clientchallenge=%@",
                            _baseURL, _uniqueId, _deviceName, [self bytesToHex:challenge]];
-    return [self createRequestFromString:urlString];
+    return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest*) newChallengeRespRequest:(NSData*)challengeResp {
     NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&serverchallengeresp=%@",
                            _baseURL, _uniqueId, _deviceName, [self bytesToHex:challengeResp]];
-    return [self createRequestFromString:urlString];
+    return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest*) newClientSecretRespRequest:(NSString*)clientPairSecret {
     NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&clientpairingsecret=%@", _baseURL, _uniqueId, _deviceName, clientPairSecret];
-    return [self createRequestFromString:urlString];
+    return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest*) newPairChallenge {
     NSString* urlString = [NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&phrase=pairchallenge", _baseURL, _uniqueId, _deviceName];
-    return [self createRequestFromString:urlString];
+    return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest *)newAppListRequest {
     NSString* urlString = [NSString stringWithFormat:@"%@/applist?uniqueid=%@", _baseURL, _uniqueId];
-    return [self createRequestFromString:urlString];
+    return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest *)newServerInfoRequest {
     NSString* urlString = [NSString stringWithFormat:@"%@/serverinfo?uniqueid=%@", _baseURL, _uniqueId];
-    return [self createRequestFromString:urlString];
+    return [self createRequestFromString:urlString enableTimeout:TRUE];
 }
 
 - (NSURLRequest*) newLaunchRequest:(NSString*)appId width:(int)width height:(int)height refreshRate:(int)refreshRate rikey:(NSString*)rikey rikeyid:(int)rikeyid {
     NSString* urlString = [NSString stringWithFormat:@"%@/launch?uniqueid=%@&appid=%@&mode=%dx%dx%d&additionalStates=1&sops=1&rikey=%@&rikeyid=%d", _baseURL, _uniqueId, appId, width, height, refreshRate, rikey, rikeyid];
-    return [self createRequestFromString:urlString];
+    // This blocks while the app is launching
+    return [self createRequestFromString:urlString enableTimeout:FALSE];
 }
 
 - (NSURLRequest*) newResumeRequestWithRiKey:(NSString*)riKey riKeyId:(int)riKeyId {
     NSString* urlString = [NSString stringWithFormat:@"%@/resume?uniqueid=%@&rikey=%@&rikeyid=%d", _baseURL, _uniqueId, riKey, riKeyId];
-    return [self createRequestFromString:urlString];
+    // This blocks while the app is resuming
+    return [self createRequestFromString:urlString enableTimeout:FALSE];
+}
+
+- (NSURLRequest*) newQuitAppRequest {
+    NSString* urlString = [NSString stringWithFormat:@"%@/cancel?uniqueid=%@", _baseURL, _uniqueId];
+    return [self createRequestFromString:urlString enableTimeout:FALSE];
+}
+
+- (NSURLRequest*) newAppAssetRequestWithAppId:(NSString *)appId {
+    NSString* urlString = [NSString stringWithFormat:@"%@/appasset?uniqueid=%@&appid=%@&AssetType=2&AssetIdx=0", _baseURL, _uniqueId, appId];
+    return [self createRequestFromString:urlString enableTimeout:FALSE];
 }
 
 - (NSString*) bytesToHex:(NSData*)data {
@@ -170,16 +154,20 @@ static const NSString* PORT = @"47984";
 }
 
 - (void)connection:(NSURLConnection *)connection didReceiveResponse:(NSURLResponse *)response {
-    NSLog(@"Received response: %@", response);
+    Log(LOG_D, @"Received response: %@", response);
 }
 
 - (void)connection:(NSURLConnection *)connection didReceiveData:(NSData *)data {
-    NSLog(@"Received data: %@", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
+    Log(LOG_D, @"\n\nReceived data: %@\n\n", [[NSString alloc] initWithData:data encoding:NSUTF8StringEncoding]);
     [_respData appendData:data];
 }
 
 - (void)connectionDidFinishLoading:(NSURLConnection *)connection {
-    _requestResp = [HttpManager fixXmlVersion:_respData];
+    if ([[NSString alloc] initWithData:_respData encoding:NSUTF8StringEncoding] != nil) {
+        _requestResp = [HttpManager fixXmlVersion:_respData];
+    } else {
+        _requestResp = _respData;
+    }
     dispatch_semaphore_signal(_requestLock);
 }
 
@@ -214,11 +202,11 @@ static const NSString* PORT = @"47984";
     OSStatus securityError = SecPKCS12Import(p12Data, options, &items);
 
     if (securityError == errSecSuccess) {
-        //NSLog(@"Success opening p12 certificate. Items: %ld", CFArrayGetCount(items));
+        //Log(LOG_D, @"Success opening p12 certificate. Items: %ld", CFArrayGetCount(items));
         CFDictionaryRef identityDict = CFArrayGetValueAtIndex(items, 0);
         identityApp = (SecIdentityRef)CFDictionaryGetValue(identityDict, kSecImportItemIdentity);
     } else {
-        NSLog(@"Error opening Certificate.");
+        Log(LOG_E, @"Error opening Certificate.");
     }
     
     CFRelease(options);
@@ -228,7 +216,8 @@ static const NSString* PORT = @"47984";
 }
 
 - (void)connection:(NSURLConnection *)connection didFailWithError:(NSError *)error {
-    NSLog(@"connection error: %@", error);
+    Log(LOG_D, @"connection error: %@", error);
+    dispatch_semaphore_signal(_requestLock);
 }
 
 @end

Limelight/Network/HttpRequest.h

@@ -0,0 +1,20 @@
+//
+//  HttpRequest.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "HttpResponse.h"
+
+@interface HttpRequest : NSObject
+
+@property (nonatomic) id<Response> response;
+@property (nonatomic) NSURLRequest* request;
+
++ (instancetype) requestForResponse:(id<Response>)response withUrlRequest:(NSURLRequest*)req;
++ (instancetype) requestWithUrlRequest:(NSURLRequest*)req;
+
+@end

Limelight/Network/HttpRequest.m

@@ -0,0 +1,28 @@
+//
+//  HttpRequest.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "HttpRequest.h"
+#import "HttpResponse.h"
+#import "HttpManager.h"
+
+@implementation HttpRequest
+
++ (HttpRequest*) requestForResponse:(id<Response>)response withUrlRequest:(NSURLRequest*)req {
+    HttpRequest* request = [[HttpRequest alloc] init];
+    request.request = req;
+    request.response = response;
+    return request;
+}
+
++ (HttpRequest*) requestWithUrlRequest:(NSURLRequest*)req {
+    HttpRequest* request = [[HttpRequest alloc] init];
+    request.request = req;
+    return request;
+}
+
+@end

Limelight/Network/HttpResponse.h

@@ -0,0 +1,33 @@
+//
+//  HttpResponse.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 1/30/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Host.h"
+
+static NSString* TAG_STATUS_CODE = @"status_code";
+static NSString* TAG_STATUS_MESSAGE = @"status_message";
+
+@protocol Response <NSObject>
+
+- (void) populateWithData:(NSData*)data;
+
+@property (nonatomic) NSInteger statusCode;
+@property (nonatomic) NSString* statusMessage;
+@property (nonatomic) NSData* data;
+
+@end
+
+@interface HttpResponse : NSObject <Response>
+
+- (void) populateWithData:(NSData*)data;
+- (void) parseData;
+- (NSString*) getStringTag:(NSString*)tag;
+- (BOOL) getIntTag:(NSString *)tag value:(NSInteger*)value;
+- (BOOL) isStatusOk;
+
+@end

Limelight/Network/HttpResponse.m

@@ -0,0 +1,94 @@
+//
+//  HttpResponse.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 1/30/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "HttpResponse.h"
+#import "App.h"
+#import <libxml2/libxml/xmlreader.h>
+
+@implementation HttpResponse {
+    NSMutableDictionary* _elements;
+}
+@synthesize data, statusCode, statusMessage;
+
+- (void) populateWithData:(NSData*)xml {
+    self.data = xml;
+    [self parseData];
+}
+
+- (NSString*) getStringTag:(NSString*)tag {
+    return [_elements objectForKey:tag];
+}
+
+- (BOOL) getIntTag:(NSString *)tag value:(NSInteger*)value {
+    NSString* stringVal = [self getStringTag:tag];
+    if (stringVal != nil) {
+        *value = [stringVal integerValue];
+        return true;
+    } else {
+        return false;
+    }
+}
+
+- (BOOL) isStatusOk {
+    return self.statusCode == 200;
+}
+
+- (void) parseData {
+    _elements = [[NSMutableDictionary alloc] init];
+    xmlDocPtr docPtr = xmlParseMemory([self.data bytes], (int)[self.data length]);
+    if (docPtr == NULL) {
+        Log(LOG_W, @"An error occured trying to parse xml.");
+        return;
+    }
+    
+    xmlNodePtr node = xmlDocGetRootElement(docPtr);
+    if (node == NULL) {
+        Log(LOG_W, @"No root XML element.");
+        xmlFreeDoc(docPtr);
+        return;
+    }
+
+    xmlChar* statusStr = xmlGetProp(node, (const xmlChar*)[TAG_STATUS_CODE UTF8String]);
+    if (statusStr != NULL) {
+        int status = [[NSString stringWithUTF8String:(const char*)statusStr] intValue];
+        xmlFree(statusStr);
+        self.statusCode = status;
+    }
+    
+    xmlChar* statusMsgXml = xmlGetProp(node, (const xmlChar*)[TAG_STATUS_MESSAGE UTF8String]);
+    NSString* statusMsg;
+    if (statusMsgXml != NULL) {
+        statusMsg = [NSString stringWithUTF8String:(const char*)statusMsgXml];
+        xmlFree(statusMsgXml);
+    }
+    else {
+        statusMsg = @"Server Error";
+    }
+    self.statusMessage = statusMsg;
+
+    node = node->children;
+    
+    while (node != NULL) {
+        xmlChar* nodeVal = xmlNodeListGetString(docPtr, node->xmlChildrenNode, 1);
+        
+        NSString* value;
+        if (nodeVal == NULL) {
+            value = @"";
+        } else {
+            value = [[NSString alloc] initWithCString:(const char*)nodeVal encoding:NSUTF8StringEncoding];
+        }
+        NSString* key = [[NSString alloc] initWithCString:(const char*)node->name encoding:NSUTF8StringEncoding];
+        [_elements setObject:value forKey:key];
+        xmlFree(nodeVal);
+        node = node->next;
+    }
+    
+    xmlFreeDoc(docPtr);
+}
+
+@end

Limelight/Network/MDNSManager.m

@@ -7,12 +7,15 @@
 //
 
 #import "MDNSManager.h"
-#import "Computer.h"
+#import "Host.h"
+#import "DataManager.h"
 
-@implementation MDNSManager : NSObject
-NSNetServiceBrowser* mDNSBrowser;
-NSMutableArray* domains;
-NSMutableArray* services;
+@implementation MDNSManager {
+    NSNetServiceBrowser* mDNSBrowser;
+    NSMutableArray* domains;
+    NSMutableArray* services;
+    BOOL scanActive;
+}
 
 static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
 
@@ -31,49 +34,96 @@ static NSString* NV_SERVICE_TYPE = @"_nvstream._tcp";
 }
 
 - (void) searchForHosts {
-    NSLog(@"Starting mDNS discovery");
+    Log(LOG_I, @"Starting mDNS discovery");
+    scanActive = TRUE;
     [mDNSBrowser searchForServicesOfType:NV_SERVICE_TYPE inDomain:@""];
 }
 
 - (void) stopSearching {
-    NSLog(@"Stopping mDNS discovery");
+    Log(LOG_I, @"Stopping mDNS discovery");
+    scanActive = FALSE;
     [mDNSBrowser stop];
 }
 
 - (NSArray*) getFoundHosts {
     NSMutableArray* hosts = [[NSMutableArray alloc] init];
+    DataManager* dataMan = [[DataManager alloc] init];
     for (NSNetService* service in services) {
         if (service.hostName != nil) {
-            [hosts addObject:[[Computer alloc] initWithHost:service]];
+            Host* host = [dataMan createHost];
+            host.address = service.hostName;
+            host.name = host.address;
+            [hosts addObject:host];
         }
     }
-    return [[NSArray alloc] initWithArray:hosts];
+    return hosts;
 }
 
 - (void)netServiceDidResolveAddress:(NSNetService *)service {
-    NSLog(@"Resolved address: %@ -> %@", service, service.hostName);
+    Log(LOG_I, @"Resolved address: %@ -> %@", service, service.hostName);
     [self.callback updateHosts:[self getFoundHosts]];
 }
 
 - (void)netService:(NSNetService *)sender didNotResolve:(NSDictionary *)errorDict {
-    NSLog(@"Did not resolve address for: %@\n%@", sender, [errorDict description]);
+    Log(LOG_W, @"Did not resolve address for: %@\n%@", sender, [errorDict description]);
+    
+    // Schedule a retry in 2 seconds
+    [NSTimer scheduledTimerWithTimeInterval:2.0
+                                     target:self
+                                   selector:@selector(retryResolveTimerCallback:)
+                                   userInfo:nil
+                                    repeats:NO];
 }
 
 - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didFindService:(NSNetService *)aNetService moreComing:(BOOL)moreComing {
-    NSLog(@"Found service: %@", aNetService);
+    Log(LOG_I, @"Found service: %@", aNetService);
     [aNetService setDelegate:self];
     [aNetService resolveWithTimeout:5];
+    
+    [services removeObject:aNetService];
     [services addObject:aNetService];
 }
 
 - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didRemoveService:(NSNetService *)aNetService moreComing:(BOOL)moreComing {
-    NSLog(@"Removing service: %@", aNetService);
+    Log(LOG_I, @"Removing service: %@", aNetService);
     [services removeObject:aNetService];
 }
 
 - (void)netServiceBrowser:(NSNetServiceBrowser *)aNetServiceBrowser didNotSearch:(NSDictionary *)errorDict {
-    NSLog(@"Did not perform search");
-    NSLog(@"%@", [errorDict description]);
+    Log(LOG_W, @"Did not perform search: \n%@", [errorDict description]);
+    
+    // Schedule a retry in 2 seconds
+    [NSTimer scheduledTimerWithTimeInterval:2.0
+                                     target:self
+                                   selector:@selector(retrySearchTimerCallback:)
+                                   userInfo:nil
+                                    repeats:NO];
+}
+
+- (void)retrySearchTimerCallback:(NSTimer *)timer {
+    // Check if we've been stopped since this was queued
+    if (!scanActive) {
+        return;
+    }
+    
+    Log(LOG_I, @"Retrying mDNS search");
+    [mDNSBrowser stop];
+    [mDNSBrowser searchForServicesOfType:NV_SERVICE_TYPE inDomain:@""];
+}
+
+- (void)retryResolveTimerCallback:(NSTimer *)timer {
+    // Check if we've been stopped since this was queued
+    if (!scanActive) {
+        return;
+    }
+    
+    Log(LOG_I, @"Retrying mDNS resolution");
+    for (NSNetService* service in services) {
+        if (service.hostName == nil) {
+            [service setDelegate:self];
+            [service resolveWithTimeout:5];
+        }
+    }
 }
 
 @end

Limelight/Network/PairManager.h

@@ -14,6 +14,7 @@
 - (void) showPIN:(NSString*)PIN;
 - (void) pairSuccessful;
 - (void) pairFailed:(NSString*)message;
+- (void) alreadyPaired;
 
 @end
 

Limelight/Network/PairManager.m

@@ -9,6 +9,9 @@
 #import "PairManager.h"
 #import "CryptoManager.h"
 #import "Utils.h"
+#import "HttpResponse.h"
+#import "HttpRequest.h"
+#import "ServerInfoResponse.h"
 
 #include <dispatch/dispatch.h>
 
@@ -27,30 +30,42 @@
 }
 
 - (void) main {
-    NSData* serverInfo = [_httpManager executeRequestSynchronously:[_httpManager newServerInfoRequest]];
-    if (![[HttpManager getStringFromXML:serverInfo tag:@"PairStatus"] isEqual:@"1"]) {
-        [self initiatePair];
-    } else {
-        [_callback pairFailed:@"Already Paired"];
+    ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init];
+    [_httpManager executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[_httpManager newServerInfoRequest]]];
+    if (serverInfoResp == nil) {
+        [_callback pairFailed:@"Unable to connect to PC"];
+        return;
+    }
+    if ([serverInfoResp isStatusOk]) {
+        if (![[serverInfoResp getStringTag:@"currentgame"] isEqual:@"0"]) {
+            [_callback pairFailed:@"You must stop streaming before attempting to pair."];
+        } else if (![[serverInfoResp getStringTag:@"PairStatus"] isEqual:@"1"]) {
+            [self initiatePair];
+        } else {
+            [_callback alreadyPaired];
+        }
     }
-    [_httpManager executeRequestSynchronously:[_httpManager newAppListRequest]];
 }
 
 - (void) initiatePair {
     NSString* PIN = [self generatePIN];
     NSData* salt = [self saltPIN:PIN];
-    NSLog(@"PIN: %@, saltedPIN: %@", PIN, salt);
+    Log(LOG_I, @"PIN: %@, saltedPIN: %@", PIN, salt);
     [_callback showPIN:PIN];
     
-    NSData* pairResp = [_httpManager executeRequestSynchronously:[_httpManager newPairRequest:salt]];
-    if ([[HttpManager getStringFromXML:pairResp tag:@"paired"] intValue] != 1) {
-        [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
-        //TODO: better message
-        [_callback pairFailed:@"pairResp failed"];
+    HttpResponse* pairResp = [[HttpResponse alloc] init];
+    [_httpManager executeRequestSynchronously:[HttpRequest requestForResponse:pairResp withUrlRequest:[_httpManager newPairRequest:salt]]];
+    if (![self verifyResponseStatus:pairResp]) {
+        return;
+    }
+    NSInteger pairedStatus;
+    if (![pairResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) {
+        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_callback pairFailed:@"Pairing was declined by the target."];
         return;
     }
     
-    NSString* plainCert = [HttpManager getStringFromXML:pairResp tag:@"plaincert"];
+    NSString* plainCert = [pairResp getStringTag:@"plaincert"];
     
     CryptoManager* cryptoMan = [[CryptoManager alloc] init];
     NSData* aesKey = [cryptoMan createAESKeyFromSalt:salt];
@@ -58,15 +73,18 @@
     NSData* randomChallenge = [Utils randomBytes:16];
     NSData* encryptedChallenge = [cryptoMan aesEncrypt:randomChallenge withKey:aesKey];
     
-    NSData* challengeResp = [_httpManager executeRequestSynchronously:[_httpManager newChallengeRequest:encryptedChallenge]];
-    if ([[HttpManager getStringFromXML:challengeResp tag:@"paired"] intValue] != 1) {
-        [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
-        //TODO: better message
-        [_callback pairFailed:@"challengeResp failed"];
+    HttpResponse* challengeResp = [[HttpResponse alloc] init];
+    [_httpManager executeRequestSynchronously:[HttpRequest requestForResponse:challengeResp withUrlRequest:[_httpManager newChallengeRequest:encryptedChallenge]]];
+    if (![self verifyResponseStatus:challengeResp]) {
+        return;
+    }
+    if (![challengeResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) {
+        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_callback pairFailed:@"Pairing stage #2 failed"];
         return;
     }
     
-    NSData* encServerChallengeResp = [Utils hexToBytes:[HttpManager getStringFromXML:challengeResp tag:@"challengeresponse"]];
+    NSData* encServerChallengeResp = [Utils hexToBytes:[challengeResp getStringTag:@"challengeresponse"]];
     NSData* decServerChallengeResp = [cryptoMan aesDecrypt:encServerChallengeResp withKey:aesKey];
     
     NSData* serverResponse = [decServerChallengeResp subdataWithRange:NSMakeRange(0, 20)];
@@ -76,52 +94,73 @@
     NSData* challengeRespHash = [cryptoMan SHA1HashData:[self concatData:[self concatData:serverChallenge with:[CryptoManager getSignatureFromCert:_cert]] with:clientSecret]];
     NSData* challengeRespEncrypted = [cryptoMan aesEncrypt:challengeRespHash withKey:aesKey];
     
-    NSData* secretResp = [_httpManager executeRequestSynchronously:[_httpManager newChallengeRespRequest:challengeRespEncrypted]];
-    if ([[HttpManager getStringFromXML:secretResp tag:@"paired"] intValue] != 1) {
-        [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
-        //TODO: better message
-        [_callback pairFailed:@"secretResp failed"];
+    HttpResponse* secretResp = [[HttpResponse alloc] init];
+    [_httpManager executeRequestSynchronously:[HttpRequest requestForResponse:secretResp withUrlRequest:[_httpManager newChallengeRespRequest:challengeRespEncrypted]]];
+    if (![self verifyResponseStatus:secretResp]) {
+        return;
+    }
+    if (![secretResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) {
+        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_callback pairFailed:@"Pairing stage #3 failed"];
         return;
     }
     
-    NSData* serverSecretResp = [Utils hexToBytes:[HttpManager getStringFromXML:secretResp tag:@"pairingsecret"]];
+    NSData* serverSecretResp = [Utils hexToBytes:[secretResp getStringTag:@"pairingsecret"]];
     NSData* serverSecret = [serverSecretResp subdataWithRange:NSMakeRange(0, 16)];
     NSData* serverSignature = [serverSecretResp subdataWithRange:NSMakeRange(16, 256)];
     
     if (![cryptoMan verifySignature:serverSecret withSignature:serverSignature andCert:[Utils hexToBytes:plainCert]]) {
-        [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
-        //TODO: better message
-        [_callback pairFailed:@"verifySignature failed"];
+        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_callback pairFailed:@"Server certificate invalid"];
         return;
     }
     
     NSData* serverChallengeRespHash = [cryptoMan SHA1HashData:[self concatData:[self concatData:randomChallenge with:[CryptoManager getSignatureFromCert:[Utils hexToBytes:plainCert]]] with:serverSecret]];
     if (![serverChallengeRespHash isEqual:serverResponse]) {
-        [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
-        //TODO: better message
-        [_callback pairFailed:@"serverChallengeResp failed"];
+        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_callback pairFailed:@"Incorrect PIN"];
         return;
     }
     
     NSData* clientPairingSecret = [self concatData:clientSecret with:[cryptoMan signData:clientSecret withKey:[CryptoManager readKeyFromFile]]];
-    NSData* clientSecretResp = [_httpManager executeRequestSynchronously:[_httpManager newClientSecretRespRequest:[Utils bytesToHex:clientPairingSecret]]];
-    if (![[HttpManager getStringFromXML:clientSecretResp tag:@"paired"] isEqual:@"1"]) {
-        [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
-        //TODO: better message
-        [_callback pairFailed:@"clientSecretResp failed"];
+    HttpResponse* clientSecretResp = [[HttpResponse alloc] init];
+    [_httpManager executeRequestSynchronously:[HttpRequest requestForResponse:clientSecretResp withUrlRequest:[_httpManager newClientSecretRespRequest:[Utils bytesToHex:clientPairingSecret]]]];
+    if (![self verifyResponseStatus:clientSecretResp]) {
+        return;
+    }
+    if (![clientSecretResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) {
+        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_callback pairFailed:@"Pairing stage #4 failed"];
         return;
     }
     
-    NSData* clientPairChallenge = [_httpManager executeRequestSynchronously:[_httpManager newPairChallenge]];
-    if (![[HttpManager getStringFromXML:clientPairChallenge tag:@"paired"] isEqual:@"1"]) {
-        [_httpManager executeRequestSynchronously:[_httpManager newUnpairRequest]];
-        //TODO: better message
-        [_callback pairFailed:@"clientPairChallenge failed"];
+    HttpResponse* clientPairChallengeResp = [[HttpResponse alloc] init];
+    [_httpManager executeRequestSynchronously:[HttpRequest requestForResponse:clientPairChallengeResp withUrlRequest:[_httpManager newPairChallenge]]];
+    if (![self verifyResponseStatus:clientPairChallengeResp]) {
+        return;
+    }
+    if (![clientPairChallengeResp getIntTag:@"paired" value:&pairedStatus] || !pairedStatus) {
+        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_callback pairFailed:@"Pairing stage #5 failed"];
         return;
     }
     [_callback pairSuccessful];
 }
 
+- (BOOL) verifyResponseStatus:(HttpResponse*)resp {
+    if (resp == nil) {
+        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_callback pairFailed:@"Network error occured."];
+        return false;
+    } else if (![resp isStatusOk]) {
+        [_httpManager executeRequest:[HttpRequest requestWithUrlRequest:[_httpManager newUnpairRequest]]];
+        [_callback pairFailed:resp.statusMessage];
+        return false;
+    } else {
+        return true;
+    }
+}
+
 - (NSData*) concatData:(NSData*)data with:(NSData*)moreData {
     NSMutableData* concatData = [[NSMutableData alloc] initWithData:data];
     [concatData appendData:moreData];

Limelight/Network/ServerInfoResponse.h

@@ -0,0 +1,24 @@
+//
+//  ServerInfoResponse.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "HttpResponse.h"
+
+#define TAG_HOSTNAME @"hostname"
+#define TAG_EXTERNAL_IP @"ExternalIP"
+#define TAG_LOCAL_IP @"LocalIP"
+#define TAG_UNIQUE_ID @"uniqueid"
+#define TAG_MAC_ADDRESS @"mac"
+#define TAG_PAIR_STATUS @"PairStatus"
+
+@interface ServerInfoResponse : HttpResponse <Response>
+
+- (void) populateWithData:(NSData *)data;
+- (void) populateHost:(Host*)host;
+
+@end
+

Limelight/Network/ServerInfoResponse.m

@@ -0,0 +1,35 @@
+//
+//  ServerInfoResponse.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/1/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "ServerInfoResponse.h"
+#import <libxml2/libxml/xmlreader.h>
+
+@implementation ServerInfoResponse
+@synthesize data, statusCode, statusMessage;
+
+- (void) populateWithData:(NSData *)xml {
+    self.data = xml;
+    [super parseData];
+}
+
+- (void) populateHost:(Host*)host {
+    host.name = [self getStringTag:TAG_HOSTNAME];
+    host.externalAddress = [self getStringTag:TAG_EXTERNAL_IP];
+    host.localAddress = [self getStringTag:TAG_LOCAL_IP];
+    host.uuid = [self getStringTag:TAG_UNIQUE_ID];
+    host.mac = [self getStringTag:TAG_MAC_ADDRESS];
+    
+    NSInteger pairStatus;
+    if ([self getIntTag:TAG_PAIR_STATUS value:&pairStatus]) {
+        host.pairState = pairStatus ? PairStatePaired : PairStateUnpaired;
+    } else {
+        host.pairState = PairStateUnknown;
+    }
+}
+
+@end

Limelight/Network/WakeOnLanManager.h

@@ -0,0 +1,16 @@
+//
+//  WakeOnLanManager.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 1/2/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+#import "Host.h"
+
+@interface WakeOnLanManager : NSObject
+
++ (void) wakeHost:(Host*)host;
+
+@end

Limelight/Network/WakeOnLanManager.m

@@ -0,0 +1,83 @@
+//
+//  WakeOnLanManager.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 1/2/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "WakeOnLanManager.h"
+#import "Utils.h"
+#import <CoreFoundation/CoreFoundation.h>
+#import <sys/socket.h>
+#import <netinet/in.h>
+#import <arpa/inet.h>
+
+@implementation WakeOnLanManager
+
+static const int numPorts = 5;
+static const int ports[numPorts] = {7, 9, 47998, 47999, 48000};
+
++ (void) wakeHost:(Host*)host {
+    NSData* wolPayload = [WakeOnLanManager createPayload:host];
+    CFDataRef dataPayload = CFDataCreate(kCFAllocatorDefault, [wolPayload bytes], [wolPayload length]);
+    CFSocketRef wolSocket = CFSocketCreate(kCFAllocatorDefault, PF_INET, SOCK_DGRAM, IPPROTO_UDP, 0, NULL, NULL);
+    if (!wolSocket) {
+        CFRelease(dataPayload);
+        Log(LOG_E, @"Failed to create WOL socket");
+        return;
+    }
+    Log(LOG_I, @"WOL socket created");
+    
+    struct sockaddr_in addr;
+    memset(&addr, 0, sizeof(addr));
+    addr.sin_family = AF_INET;
+    addr.sin_len = sizeof(addr);
+    
+    
+    for (int i = 0; i < 2; i++) {
+        // try all ip addresses
+        if (i == 0) {
+            inet_aton([host.localAddress UTF8String], &addr.sin_addr);
+        } else {
+            inet_aton([host.externalAddress UTF8String], &addr.sin_addr);
+        }
+
+        CFDataRef dataAddress = CFDataCreate(kCFAllocatorDefault, (unsigned char*)&addr, sizeof(addr));
+        
+        // try all ports
+        for (int j = 0; j < numPorts; j++) {
+            addr.sin_port = htons(ports[j]);
+            Log(LOG_I, @"Sending WOL packet");
+            CFSocketSendData(wolSocket, dataAddress, dataPayload, 0);
+        }
+        CFRelease(dataAddress);
+    }
+    CFRelease(dataPayload);
+}
+
++ (NSData*) createPayload:(Host*)host {
+    NSMutableData* payload = [[NSMutableData alloc] initWithCapacity:102];
+    
+    // 6 bytes of FF
+    UInt8 header = 0xFF;
+    for (int i = 0; i < 6; i++) {
+        [payload appendBytes:&header length:1];
+    }
+    
+    // 16 repitiions of MAC address
+    NSData* macAddress = [self macStringToBytes:host.mac];
+    for (int j = 0; j < 16; j++) {
+        [payload appendData:macAddress];
+    }
+    
+    return payload;
+}
+
++ (NSData*) macStringToBytes:(NSString*)mac {
+    NSString* macString = [mac stringByReplacingOccurrencesOfString:@":" withString:@""];
+    Log(LOG_D, @"MAC: %@", macString);
+    return [Utils hexToBytes:macString];
+}
+
+@end

Limelight/Stream/Connection.h

@@ -10,16 +10,24 @@
 #import "VideoDecoderRenderer.h"
 #import "StreamConfiguration.h"
 
-@protocol ConTermCallback <NSObject>
+@protocol ConnectionCallbacks <NSObject>
 
-- (void) connectionTerminated;
+- (void) connectionStarted;
+- (void) connectionTerminated:(long)errorCode;
+- (void) stageStarting:(char*)stageName;
+- (void) stageComplete:(char*)stageName;
+- (void) stageFailed:(char*)stageName withError:(long)errorCode;
+- (void) launchFailed:(NSString*)message;
+- (void) displayMessage:(char*)message;
+- (void) displayTransientMessage:(char*)message;
 
 @end
 
 @interface Connection : NSOperation <NSStreamDelegate>
 
--(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionTerminatedCallback:(id<ConTermCallback>)callback;
+-(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionCallbacks:(id<ConnectionCallbacks>)callbacks serverMajorVersion:(int)serverMajorVersion;
 -(void) terminate;
+-(void) terminateInternal;
 -(void) main;
 
 @end

Limelight/Stream/Connection.m

@@ -20,11 +20,11 @@
     CONNECTION_LISTENER_CALLBACKS _clCallbacks;
     DECODER_RENDERER_CALLBACKS _drCallbacks;
     AUDIO_RENDERER_CALLBACKS _arCallbacks;
-    
+    int _serverMajorVersion;
 }
 
 static OpusDecoder *opusDecoder;
-static id<ConTermCallback> _callback;
+static id<ConnectionCallbacks> _callbacks;
 
 #define PCM_BUFFER_SIZE 1024
 #define OUTPUT_BUS 0
@@ -49,22 +49,24 @@ void DrSetup(int width, int height, int fps, void* context, int drFlags)
 {
 }
 
-void DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit)
+int DrSubmitDecodeUnit(PDECODE_UNIT decodeUnit)
 {
+    int offset = 0;
     unsigned char* data = (unsigned char*) malloc(decodeUnit->fullLength);
-    if (data != NULL) {
-        int offset = 0;
-        
-        PLENTRY entry = decodeUnit->bufferList;
-        while (entry != NULL) {
-            memcpy(&data[offset], entry->data, entry->length);
-            offset += entry->length;
-            entry = entry->next;
-        }
-        
-        // This function will take our buffer
-        [renderer submitDecodeBuffer:data length:decodeUnit->fullLength];
+    if (data == NULL) {
+        // A frame was lost due to OOM condition
+        return DR_NEED_IDR;
     }
+    
+    PLENTRY entry = decodeUnit->bufferList;
+    while (entry != NULL) {
+        memcpy(&data[offset], entry->data, entry->length);
+        offset += entry->length;
+        entry = entry->next;
+    }
+    
+    // This function will take our buffer
+    return [renderer submitDecodeBuffer:data length:decodeUnit->fullLength];
 }
 
 void DrStart(void)
@@ -109,7 +111,7 @@ void ArInit(void)
     status = AudioComponentInstanceNew(AudioComponentFindNext(NULL, &audioDesc), &audioUnit);
     
     if (status) {
-        printf("Unable to instantiate new AudioComponent: %d\n", (int32_t)status);
+        Log(LOG_E, @"Unable to instantiate new AudioComponent: %d", (int32_t)status);
     }
     
     AudioStreamBasicDescription audioFormat = {0};
@@ -130,7 +132,7 @@ void ArInit(void)
                                   &audioFormat,
                                   sizeof(audioFormat));
     if (status) {
-        printf("Unable to set audio unit to input: %d\n", (int32_t)status);
+        Log(LOG_E, @"Unable to set audio unit to input: %d", (int32_t)status);
     }
     
     AURenderCallbackStruct callbackStruct = {0};
@@ -144,12 +146,12 @@ void ArInit(void)
                                   &callbackStruct,
                                   sizeof(callbackStruct));
     if (status) {
-        printf("Unable to set audio unit callback: %d\n", (int32_t)status);
+        Log(LOG_E, @"Unable to set audio unit callback: %d", (int32_t)status);
     }
     
     status = AudioUnitInitialize(audioUnit);
     if (status) {
-        printf("Unable to initialize audioUnit: %d\n", (int32_t)status);
+        Log(LOG_E, @"Unable to initialize audioUnit: %d", (int32_t)status);
     }
 }
 
@@ -162,7 +164,7 @@ void ArRelease(void)
     
     OSStatus status = AudioUnitUninitialize(audioUnit);
     if (status) {
-        printf("Unable to uninitialize audioUnit: %d\n", (int32_t)status);
+        Log(LOG_E, @"Unable to uninitialize audioUnit: %d", (int32_t)status);
     }
     
     // Audio session is now inactive
@@ -184,7 +186,7 @@ void ArStart(void)
 {
     OSStatus status = AudioOutputUnitStart(audioUnit);
     if (status) {
-        printf("Unable to start audioUnit: %d\n", (int32_t)status);
+        Log(LOG_E, @"Unable to start audioUnit: %d", (int32_t)status);
     }
 }
 
@@ -192,7 +194,7 @@ void ArStop(void)
 {
     OSStatus status = AudioOutputUnitStop(audioUnit);
     if (status) {
-        printf("Unable to stop audioUnit: %d\n", (int32_t)status);
+        Log(LOG_E, @"Unable to stop audioUnit: %d", (int32_t)status);
     }
 }
 
@@ -212,7 +214,7 @@ void ArDecodeAndPlaySample(char* sampleData, int sampleLength)
             
             [audioLock lock];
             if (audioBufferQueueLength > MAX_QUEUE_ENTRIES) {
-                printf("Audio player too slow. Dropping all decoded samples!\n");
+                Log(LOG_W, @"Audio player too slow. Dropping all decoded samples!");
                 
                 // Clear all values from the buffer queue
                 struct AUDIO_BUFFER_QUEUE_ENTRY *entry;
@@ -243,40 +245,40 @@ void ArDecodeAndPlaySample(char* sampleData, int sampleLength)
 
 void ClStageStarting(int stage)
 {
+    [_callbacks stageStarting:(char*)LiGetStageName(stage)];
 }
 
 void ClStageComplete(int stage)
 {
+    [_callbacks stageComplete:(char*)LiGetStageName(stage)];
 }
 
 void ClStageFailed(int stage, long errorCode)
 {
-    printf("Stage %d failed: %ld\n", stage, errorCode);
+    [_callbacks stageFailed:(char*)LiGetStageName(stage) withError:errorCode];
 }
 
 void ClConnectionStarted(void)
 {
-    printf("Connection started\n");
+    [_callbacks connectionStarted];
 }
 
 void ClConnectionTerminated(long errorCode)
 {
-    printf("ConnectionTerminated: %ld\n", errorCode);
-    
-    [_callback connectionTerminated];
+    [_callbacks connectionTerminated: errorCode];
 }
 
 void ClDisplayMessage(char* message)
 {
-    printf("DisplayMessage: %s\n", message);
+    [_callbacks displayMessage: message];
 }
 
 void ClDisplayTransientMessage(char* message)
 {
-    printf("DisplayTransientMessage: %s\n", message);
+    [_callbacks displayTransientMessage: message];
 }
 
--(void) terminate
+-(void) terminateInternal
 {
     // We dispatch this async to get out because this can be invoked
     // on a thread inside common and we don't want to deadlock
@@ -286,17 +288,27 @@ void ClDisplayTransientMessage(char* message)
     });
 }
 
--(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionTerminatedCallback:(id<ConTermCallback>)callback
+-(void) terminate
+{
+    // We're guaranteed to not be on a limelight-common thread
+    // here so it's safe to call stop directly
+    LiStopConnection();
+}
+
+-(id) initWithConfig:(StreamConfiguration*)config renderer:(VideoDecoderRenderer*)myRenderer connectionCallbacks:(id<ConnectionCallbacks>)callbacks serverMajorVersion:(int)serverMajorVersion
 {
     self = [super init];
     _host = config.hostAddr;
     renderer = myRenderer;
-    _callback = callback;
+    _callbacks = callbacks;
+    _serverMajorVersion = serverMajorVersion;
     _streamConfig.width = config.width;
     _streamConfig.height = config.height;
     _streamConfig.fps = config.frameRate;
     _streamConfig.bitrate = config.bitRate;
-    _streamConfig.packetSize = 1024;
+    
+    // FIXME: We should use 1024 when streaming remotely
+    _streamConfig.packetSize = 1292;
     
     memcpy(_streamConfig.remoteInputAesKey, [config.riKey bytes], [config.riKey length]);
     memset(_streamConfig.remoteInputAesIv, 0, 16);
@@ -409,7 +421,19 @@ static OSStatus playbackCallback(void *inRefCon,
 
 -(void) main
 {
-    LiStartConnection(_host, &_streamConfig, &_clCallbacks, &_drCallbacks, &_arCallbacks, NULL, 0);
+    PLATFORM_CALLBACKS dummyPlCallbacks;
+    
+    // Only used on Windows
+    dummyPlCallbacks.threadStart = NULL;
+    dummyPlCallbacks.debugPrint = NULL;
+    
+    LiStartConnection(_host,
+                      &_streamConfig,
+                      &_clCallbacks,
+                      &_drCallbacks,
+                      &_arCallbacks,
+                      &dummyPlCallbacks,
+                      NULL, 0, _serverMajorVersion);
 }
 
 

Limelight/Stream/StreamConfiguration.h

@@ -11,6 +11,7 @@
 @interface StreamConfiguration : NSObject
 
 @property NSString* host;
+@property NSString* appID;
 @property int hostAddr;
 @property int width;
 @property int height;

Limelight/Stream/StreamConfiguration.m

@@ -9,5 +9,5 @@
 #import "StreamConfiguration.h"
 
 @implementation StreamConfiguration
-@synthesize host, hostAddr, width, height, frameRate, bitRate, riKeyId, riKey;
+@synthesize host, appID, hostAddr, width, height, frameRate, bitRate, riKeyId, riKey;
 @end

Limelight/Stream/StreamManager.h

@@ -12,7 +12,8 @@
 
 @interface StreamManager : NSOperation
 
-- (id) initWithConfig:(StreamConfiguration*)config renderView:(UIView*)view connectionTerminatedCallback:(id<ConTermCallback>)callback;
+- (id) initWithConfig:(StreamConfiguration*)config renderView:(UIView*)view connectionCallbacks:(id<ConnectionCallbacks>)callback;
 - (void) stopStream;
+- (void) stopStreamInternal;
 
 @end

Limelight/Stream/StreamManager.m

@@ -10,22 +10,26 @@
 #import "CryptoManager.h"
 #import "HttpManager.h"
 #import "Utils.h"
+#import "OnScreenControls.h"
+#import "StreamView.h"
+#import "ServerInfoResponse.h"
+#import "HttpResponse.h"
+#import "HttpRequest.h"
 
 @implementation StreamManager {
     StreamConfiguration* _config;
     UIView* _renderView;
-    id<ConTermCallback> _callback;
+    id<ConnectionCallbacks> _callbacks;
     Connection* _connection;
 }
 
-- (id) initWithConfig:(StreamConfiguration*)config renderView:(UIView*)view connectionTerminatedCallback:(id<ConTermCallback>)callback {
+- (id) initWithConfig:(StreamConfiguration*)config renderView:(UIView*)view connectionCallbacks:(id<ConnectionCallbacks>)callbacks {
     self = [super init];
     _config = config;
     _renderView = view;
-    _callback = callback;
+    _callbacks = callbacks;
     _config.riKey = [Utils randomBytes:16];
     _config.riKeyId = arc4random();
-    _config.bitRate = 10000;
     return self;
 }
 
@@ -40,42 +44,111 @@
                                                deviceName:@"roth"
                                                      cert:cert];
     
-    NSData* serverInfoResp = [hMan executeRequestSynchronously:[hMan newServerInfoRequest]];
-    if (![[HttpManager getStringFromXML:serverInfoResp tag:@"currentgame"] isEqualToString:@"0"]) {
-        // App already running, resume it
-        [self resumeApp:hMan];
-    } else {
-        // Start app
-        [self launchApp:hMan];
+    ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init];
+    [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest]]];
+    NSString* currentGame = [serverInfoResp getStringTag:@"currentgame"];
+    NSString* pairStatus = [serverInfoResp getStringTag:@"PairStatus"];
+    NSString* currentClient = [serverInfoResp getStringTag:@"CurrentClient"];
+    NSString* appversion = [serverInfoResp getStringTag:@"appversion"];
+    if (![serverInfoResp isStatusOk] || currentGame == NULL || pairStatus == NULL || appversion == NULL) {
+        [_callbacks launchFailed:@"Failed to connect to PC"];
+        return;
     }
     
+    if (![pairStatus isEqualToString:@"1"]) {
+        // Not paired
+        [_callbacks launchFailed:@"Device not paired to PC"];
+        return;
+    }
+    
+    // resumeApp and launchApp handle calling launchFailed
+    if (![currentGame isEqualToString:@"0"]) {
+        if (![currentClient isEqualToString:@"1"]) {
+            // The server is streaming to someone else
+            [_callbacks launchFailed:@"There is another stream in progress"];
+            return;
+        }
+        // App already running, resume it
+        if (![self resumeApp:hMan]) {
+            return;
+        }
+    } else {
+        // Start app
+        if (![self launchApp:hMan]) {
+            return;
+        }
+    }
+    
+    // Set mouse delta factors from the screen resolution and stream size
+    CGFloat screenScale = [[UIScreen mainScreen] scale];
+    CGRect screenBounds = [[UIScreen mainScreen] bounds];
+    CGSize screenSize = CGSizeMake(screenBounds.size.width * screenScale, screenBounds.size.height * screenScale);
+    [((StreamView*)_renderView) setMouseDeltaFactors:_config.width / screenSize.width
+                                                   y:_config.height / screenSize.height];
+    
+    int majorVersion = [[appversion substringToIndex:1] intValue];
+    Log(LOG_I, @"Server is generation %d", majorVersion);
+    
     VideoDecoderRenderer* renderer = [[VideoDecoderRenderer alloc]initWithView:_renderView];
-    _connection = [[Connection alloc] initWithConfig:_config renderer:renderer connectionTerminatedCallback:_callback];
+    _connection = [[Connection alloc] initWithConfig:_config renderer:renderer connectionCallbacks:_callbacks serverMajorVersion:majorVersion];
     NSOperationQueue* opQueue = [[NSOperationQueue alloc] init];
     [opQueue addOperation:_connection];
 }
 
+// This should NEVER be called from within a thread
+// owned by limelight-common
 - (void) stopStream
 {
     [_connection terminate];
 }
 
-- (void) launchApp:(HttpManager*)hMan {
-    NSData* launchResp = [hMan executeRequestSynchronously:
-                          [hMan newLaunchRequest:@"67339056"
+// This should only be called from within a thread
+// owned by limelight-common
+- (void) stopStreamInternal
+{
+    [_connection terminateInternal];
+}
+
+- (BOOL) launchApp:(HttpManager*)hMan {
+    HttpResponse* launchResp = [[HttpResponse alloc] init];
+    [hMan executeRequestSynchronously:[HttpRequest requestForResponse:launchResp withUrlRequest:
+                          [hMan newLaunchRequest:_config.appID
                                            width:_config.width
                                           height:_config.height
                                      refreshRate:_config.frameRate
                                            rikey:[Utils bytesToHex:_config.riKey]
-                                         rikeyid:_config.riKeyId]];
-    [HttpManager getStringFromXML:launchResp tag:@"gamesession"];
+                                         rikeyid:_config.riKeyId]]];
+    NSString *gameSession = [launchResp getStringTag:@"gamesession"];
+    if (launchResp == NULL || ![launchResp isStatusOk]) {
+        [_callbacks launchFailed:@"Failed to launch app"];
+        Log(LOG_E, @"Failed Launch Response: %@", launchResp.statusMessage);
+        return FALSE;
+    } else if (gameSession == NULL || [gameSession isEqualToString:@"0"]) {
+        [_callbacks launchFailed:launchResp.statusMessage];
+        Log(LOG_E, @"Failed to parse game session. Code: %ld Response: %@", (long)launchResp.statusCode, launchResp.statusMessage);
+        return FALSE;
+    }
+    
+    return TRUE;
 }
 
-- (void) resumeApp:(HttpManager*)hMan {
-    NSData* resumeResp = [hMan executeRequestSynchronously:
+- (BOOL) resumeApp:(HttpManager*)hMan {
+    HttpResponse* resumeResp = [[HttpResponse alloc] init];
+    [hMan executeRequestSynchronously:[HttpRequest requestForResponse:resumeResp withUrlRequest:
                           [hMan newResumeRequestWithRiKey:[Utils bytesToHex:_config.riKey]
-                                                  riKeyId:_config.riKeyId]];
-    [HttpManager getStringFromXML:resumeResp tag:@"gamesession"];
+                                                  riKeyId:_config.riKeyId]]];
+    NSString* resume = [resumeResp getStringTag:@"resume"];
+    if (resumeResp == NULL || ![resumeResp isStatusOk]) {
+        [_callbacks launchFailed:@"Failed to resume app"];
+        Log(LOG_E, @"Failed Resume Response: %@", resumeResp.statusMessage);
+        return FALSE;
+    } else if (resume == NULL || [resume isEqualToString:@"0"]) {
+        [_callbacks launchFailed:resumeResp.statusMessage];
+        Log(LOG_E, @"Failed to parse resume response. Code: %ld Response: %@", (long)resumeResp.statusCode, resumeResp.statusMessage);
+        return FALSE;
+    }
+    
+    return TRUE;
 }
 
 @end

Limelight/Stream/VideoDecoderRenderer.h

@@ -16,6 +16,6 @@
 
 - (void)updateBufferForRange:(CMBlockBufferRef)existingBuffer data:(unsigned char *)data offset:(int)offset length:(int)nalLength;
 
-- (void)submitDecodeBuffer:(unsigned char *)data length:(int)length;
+- (int)submitDecodeBuffer:(unsigned char *)data length:(int)length;
 
 @end

Limelight/Stream/VideoDecoderRenderer.m

@@ -8,38 +8,64 @@
 
 #import "VideoDecoderRenderer.h"
 
+#include "Limelight.h"
+
 @implementation VideoDecoderRenderer {
-    AVSampleBufferDisplayLayer* displayLayer;
-    Boolean waitingForSps, waitingForPpsA, waitingForPpsB;
+    UIView *_view;
     
-    NSData *spsData, *ppsDataA, *ppsDataB;
-    unsigned char ppsDataAFirstByte;
+    AVSampleBufferDisplayLayer* displayLayer;
+    Boolean waitingForSps, waitingForPps;
+    
+    NSData *spsData, *ppsData;
     CMVideoFormatDescriptionRef formatDesc;
 }
 
+- (void)reinitializeDisplayLayer
+{
+    CALayer *oldLayer = displayLayer;
+    
+    displayLayer = [[AVSampleBufferDisplayLayer alloc] init];
+    displayLayer.bounds = _view.bounds;
+    displayLayer.backgroundColor = [UIColor blackColor].CGColor;
+    displayLayer.position = CGPointMake(CGRectGetMidX(_view.bounds), CGRectGetMidY(_view.bounds));
+    displayLayer.videoGravity = AVLayerVideoGravityResizeAspect;
+    
+    if (oldLayer != nil) {
+        // Switch out the old display layer with the new one
+        [_view.layer replaceSublayer:oldLayer with:displayLayer];
+    }
+    else {
+        [_view.layer addSublayer:displayLayer];
+    }
+    
+    // We need some parameter sets before we can properly start decoding frames
+    waitingForSps = true;
+    spsData = nil;
+    waitingForPps = true;
+    ppsData = nil;
+    
+    if (formatDesc != nil) {
+        CFRelease(formatDesc);
+        formatDesc = nil;
+    }
+}
+
 - (id)initWithView:(UIView*)view
 {
     self = [super init];
     
-    displayLayer = [[AVSampleBufferDisplayLayer alloc] init];
-    displayLayer.bounds = view.bounds;
-    displayLayer.backgroundColor = [UIColor blackColor].CGColor;
-    displayLayer.position = CGPointMake(CGRectGetMidX(view.bounds), CGRectGetMidY(view.bounds));
-    displayLayer.videoGravity = AVLayerVideoGravityResizeAspect;
-    [view.layer addSublayer:displayLayer];
+    _view = view;
     
-    // We need some parameter sets before we can properly start decoding frames
-    waitingForSps = true;
-    waitingForPpsA = true;
-    waitingForPpsB = true;
+    [self reinitializeDisplayLayer];
     
     return self;
 }
 
 #define FRAME_START_PREFIX_SIZE 4
 #define NALU_START_PREFIX_SIZE 3
-
 #define NAL_LENGTH_PREFIX_SIZE 4
+#define NAL_TYPE_SPS 0x7
+#define NAL_TYPE_PPS 0x8
 
 - (void)updateBufferForRange:(CMBlockBufferRef)existingBuffer data:(unsigned char *)data offset:(int)offset length:(int)nalLength
 {
@@ -60,7 +86,7 @@
                                                 kCFAllocatorDefault,
                                                 NULL, 0, nalLength + 1, 0);
         if (status != noErr) {
-            printf("CMBlockBufferReplaceDataBytes failed: %d\n", (int)status);
+            Log(LOG_E, @"CMBlockBufferReplaceDataBytes failed: %d", (int)status);
             return;
         }
         
@@ -70,18 +96,17 @@
         status = CMBlockBufferReplaceDataBytes(lengthBytes, existingBuffer,
                                                oldOffset, NAL_LENGTH_PREFIX_SIZE);
         if (status != noErr) {
-            printf("CMBlockBufferReplaceDataBytes failed: %d\n", (int)status);
+            Log(LOG_E, @"CMBlockBufferReplaceDataBytes failed: %d", (int)status);
             return;
         }
-    }
-    else {
+    } else {
         // Append a 4 byte buffer to this block for the length prefix
         status = CMBlockBufferAppendMemoryBlock(existingBuffer, NULL,
                                                 NAL_LENGTH_PREFIX_SIZE,
                                                 kCFAllocatorDefault, NULL, 0,
                                                 NAL_LENGTH_PREFIX_SIZE, 0);
         if (status != noErr) {
-            printf("CMBlockBufferAppendMemoryBlock failed: %d\n", (int)status);
+            Log(LOG_E, @"CMBlockBufferAppendMemoryBlock failed: %d", (int)status);
             return;
         }
         
@@ -92,7 +117,7 @@
         status = CMBlockBufferReplaceDataBytes(lengthBytes, existingBuffer,
                                                oldOffset, NAL_LENGTH_PREFIX_SIZE);
         if (status != noErr) {
-            printf("CMBlockBufferReplaceDataBytes failed: %d\n", (int)status);
+            Log(LOG_E, @"CMBlockBufferReplaceDataBytes failed: %d", (int)status);
             return;
         }
         
@@ -102,46 +127,49 @@
                                                 kCFAllocatorNull, // Don't deallocate data on free
                                                 NULL, 0, dataLength, 0);
         if (status != noErr) {
-            printf("CMBlockBufferReplaceDataBytes failed: %d\n", (int)status);
+            Log(LOG_E, @"CMBlockBufferReplaceDataBytes failed: %d", (int)status);
             return;
         }
     }
 }
 
 // This function must free data
-- (void)submitDecodeBuffer:(unsigned char *)data length:(int)length
+- (int)submitDecodeBuffer:(unsigned char *)data length:(int)length
 {
     unsigned char nalType = data[FRAME_START_PREFIX_SIZE] & 0x1F;
     OSStatus status;
     
-    if (formatDesc == NULL && (nalType == 0x7 || nalType == 0x8)) {
-        if (waitingForSps && nalType == 0x7) {
-            printf("Got SPS\n");
+    // Check for previous decoder errors before doing anything
+    if (displayLayer.status == AVQueuedSampleBufferRenderingStatusFailed) {
+        Log(LOG_E, @"Display layer rendering failed: %@", displayLayer.error);
+        
+        // Recreate the display layer
+        [self reinitializeDisplayLayer];
+        
+        // Request an IDR frame to initialize the new decoder
+        return DR_NEED_IDR;
+    }
+    
+    if (nalType == NAL_TYPE_SPS || nalType == NAL_TYPE_PPS) {
+        if (nalType == NAL_TYPE_SPS) {
+            Log(LOG_I, @"Got SPS");
             spsData = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE];
             waitingForSps = false;
-        }
-        // Nvidia's stream has 2 PPS NALUs so we'll wait for both of them
-        else if ((waitingForPpsA || waitingForPpsB) && nalType == 0x8) {
-            // Read the NALU's PPS index to figure out which PPS this is
-            if (waitingForPpsA) {
-                printf("Got PPS 1\n");
-                ppsDataA = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE];
-                waitingForPpsA = false;
-                ppsDataAFirstByte = data[FRAME_START_PREFIX_SIZE + 1];
-            }
-            else if (data[FRAME_START_PREFIX_SIZE + 1] != ppsDataAFirstByte) {
-                printf("Got PPS 2\n");
-                ppsDataA = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE];
-                waitingForPpsB = false;
-            }
+            
+            // We got a new SPS so wait for a new PPS to match it
+            waitingForPps = true;
+        } else if (nalType == NAL_TYPE_PPS) {
+            Log(LOG_I, @"Got PPS");
+            ppsData = [NSData dataWithBytes:&data[FRAME_START_PREFIX_SIZE] length:length - FRAME_START_PREFIX_SIZE];
+            waitingForPps = false;
         }
         
         // See if we've got all the parameter sets we need
-        if (!waitingForSps && !waitingForPpsA && !waitingForPpsB) {
-            const uint8_t* const parameterSetPointers[] = { [spsData bytes], [ppsDataA bytes], [ppsDataB bytes] };
-            const size_t parameterSetSizes[] = { [spsData length], [ppsDataA length], [ppsDataB length] };
+        if (!waitingForSps && !waitingForPps) {
+            const uint8_t* const parameterSetPointers[] = { [spsData bytes], [ppsData bytes] };
+            const size_t parameterSetSizes[] = { [spsData length], [ppsData length] };
             
-            printf("Constructing format description\n");
+            Log(LOG_I, @"Constructing new format description");
             status = CMVideoFormatDescriptionCreateFromH264ParameterSets(kCFAllocatorDefault,
                                                                          2, /* count of parameter sets */
                                                                          parameterSetPointers,
@@ -149,7 +177,7 @@
                                                                          NAL_LENGTH_PREFIX_SIZE,
                                                                          &formatDesc);
             if (status != noErr) {
-                printf("Failed to create format description: %d\n", (int)status);
+                Log(LOG_E, @"Failed to create format description: %d", (int)status);
                 formatDesc = NULL;
             }
         }
@@ -158,19 +186,19 @@
         free(data);
         
         // No frame data to submit for these NALUs
-        return;
+        return DR_OK;
     }
     
     if (formatDesc == NULL) {
         // Can't decode if we haven't gotten our parameter sets yet
         free(data);
-        return;
+        return DR_OK;
     }
     
     if (nalType != 0x1 && nalType != 0x5) {
         // Don't submit parameter set data
         free(data);
-        return;
+        return DR_OK;
     }
     
     // Now we're decoding actual frame data here
@@ -178,9 +206,9 @@
     
     status = CMBlockBufferCreateEmpty(NULL, 0, 0, &blockBuffer);
     if (status != noErr) {
-        printf("CMBlockBufferCreateEmpty failed: %d\n", (int)status);
+        Log(LOG_E, @"CMBlockBufferCreateEmpty failed: %d", (int)status);
         free(data);
-        return;
+        return DR_NEED_IDR;
     }
     
     int lastOffset = -1;
@@ -213,9 +241,9 @@
                                   NULL, 0, NULL,
                                   &sampleBuffer);
     if (status != noErr) {
-        printf("CMSampleBufferCreate failed: %d\n", (int)status);
+        Log(LOG_E, @"CMSampleBufferCreate failed: %d", (int)status);
         CFRelease(blockBuffer);
-        return;
+        return DR_NEED_IDR;
     }
     
     CFArrayRef attachments = CMSampleBufferGetSampleAttachmentsArray(sampleBuffer, YES);
@@ -228,8 +256,7 @@
         // P-frame
         CFDictionarySetValue(dict, kCMSampleAttachmentKey_NotSync, kCFBooleanTrue);
         CFDictionarySetValue(dict, kCMSampleAttachmentKey_DependsOnOthers, kCFBooleanTrue);
-    }
-    else {
+    } else {
         // I-frame
         CFDictionarySetValue(dict, kCMSampleAttachmentKey_NotSync, kCFBooleanFalse);
         CFDictionarySetValue(dict, kCMSampleAttachmentKey_DependsOnOthers, kCFBooleanFalse);
@@ -240,6 +267,8 @@
     // Dereference the buffers
     CFRelease(blockBuffer);
     CFRelease(sampleBuffer);
+    
+    return DR_OK;
 }
 
 @end

Limelight/UIAppView.h

@@ -0,0 +1,23 @@
+//
+//  UIAppView.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/22/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "App.h"
+
+@protocol AppCallback <NSObject>
+
+- (void) appClicked:(App*) app;
+
+@end
+
+@interface UIAppView : UIView
+
+- (id) initWithApp:(App*)app andCallback:(id<AppCallback>)callback;
+- (void) updateAppImage;
+
+@end

Limelight/UIAppView.m

@@ -0,0 +1,83 @@
+//
+//  UIAppView.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/22/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "UIAppView.h"
+
+@implementation UIAppView {
+    App* _app;
+    UIButton* _appButton;
+    UILabel* _appLabel;
+    id<AppCallback> _callback;
+}
+static int LABEL_DY = 20;
+
+- (id) initWithApp:(App*)app andCallback:(id<AppCallback>)callback {
+    self = [super init];
+    _app = app;
+    _callback = callback;
+    
+    _appButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    UIImage* noImage = [UIImage imageNamed:@"NoAppImage"];
+    [_appButton setBackgroundImage:noImage forState:UIControlStateNormal];
+	[_appButton setContentEdgeInsets:UIEdgeInsetsMake(0, 4, 0, 4)];
+    [_appButton sizeToFit];
+    [_appButton addTarget:self action:@selector(appClicked) forControlEvents:UIControlEventTouchUpInside];
+    
+    [self addSubview:_appButton];
+    [self sizeToFit];
+    _appButton.frame = CGRectMake(0, 0, noImage.size.width, noImage.size.height);
+    self.frame = CGRectMake(0, 0, noImage.size.width, noImage.size.height);
+    
+    return self;
+}
+
+- (void) updateBounds {
+    float x = _appButton.frame.origin.x < _appLabel.frame.origin.x ? _appButton.frame.origin.x : _appLabel.frame.origin.x;
+    float y = _appButton.frame.origin.y < _appLabel.frame.origin.y ? _appButton.frame.origin.y : _appLabel.frame.origin.y;
+    self.bounds = CGRectMake(x , y, _appButton.frame.size.width > _appLabel.frame.size.width ? _appButton.frame.size.width : _appLabel.frame.size.width, _appButton.frame.size.height + _appLabel.frame.size.height + LABEL_DY / 2);
+    self.frame = CGRectMake(x , y, _appButton.frame.size.width > _appLabel.frame.size.width ? _appButton.frame.size.width : _appLabel.frame.size.width, _appButton.frame.size.height + _appLabel.frame.size.height + LABEL_DY / 2);
+}
+
+- (void) appClicked {
+    [_callback appClicked:_app];
+}
+
+- (void) updateAppImage {
+    if (_app.appImage != nil) {
+        _appButton.frame = CGRectMake(0, 0, _app.appImage.size.width / 2, _app.appImage.size.height / 2);
+        self.frame = CGRectMake(0, 0, _app.appImage.size.width / 2, _app.appImage.size.height / 2);
+        [_appButton setBackgroundImage:_app.appImage forState:UIControlStateNormal];
+        [self setNeedsDisplay];
+    }
+
+    // TODO: Improve no-app image detection
+    if (_app.appImage == nil || (_app.appImage.size.width == 130.f && _app.appImage.size.height == 180.f)) { // This size of image might be blank image received from GameStream.
+        _appLabel = [[UILabel alloc] init];
+        CGFloat padding = 4.f;
+        [_appLabel setFrame: CGRectMake(padding, padding, _appButton.frame.size.width - 2 * padding, _appButton.frame.size.height - 2 * padding)];
+        [_appLabel setTextColor:[UIColor whiteColor]];
+        [_appLabel setFont:[UIFont fontWithName:@"Roboto-Regular" size:10.f]];
+        [_appLabel setBaselineAdjustment:UIBaselineAdjustmentAlignCenters];
+        [_appLabel setTextAlignment:NSTextAlignmentCenter];
+        [_appLabel setLineBreakMode:NSLineBreakByWordWrapping];
+        [_appLabel setNumberOfLines:0];
+        [_appLabel setText:_app.appName];
+        [_appButton addSubview:_appLabel];
+    }
+
+}
+
+/*
+// Only override drawRect: if you perform custom drawing.
+// An empty implementation adversely affects performance during animation.
+- (void)drawRect:(CGRect)rect {
+    // Drawing code
+}
+*/
+
+@end

Limelight/UIComputerView.h

@@ -0,0 +1,25 @@
+//
+//  UIComputerView.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/22/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "Host.h"
+
+@protocol HostCallback <NSObject>
+
+- (void) hostClicked:(Host*)host;
+- (void) hostLongClicked:(Host*)host view:(UIView*)view;
+- (void) addHostClicked;
+
+@end
+
+@interface UIComputerView : UIView
+
+- (id) initWithComputer:(Host*)host andCallback:(id<HostCallback>)callback;
+- (id) initForAddWithCallback:(id<HostCallback>)callback;
+
+@end

Limelight/UIComputerView.m

@@ -0,0 +1,181 @@
+//
+//  UIComputerView.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/22/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "UIComputerView.h"
+
+@implementation UIComputerView {
+    Host* _host;
+    UIButton* _hostButton;
+    UILabel* _hostLabel;
+    UILabel* _hostStatus;
+    UILabel* _hostPairState;
+    id<HostCallback> _callback;
+    CGSize _labelSize;
+}
+static const float REFRESH_CYCLE = 2.0f;
+static const int LABEL_DY = 20;
+
+- (id) init {
+    self = [super init];
+    _hostButton = [UIButton buttonWithType:UIButtonTypeCustom];
+    [_hostButton setContentEdgeInsets:UIEdgeInsetsMake(0, 4, 0, 4)];
+    [_hostButton setBackgroundImage:[UIImage imageNamed:@"Computer"] forState:UIControlStateNormal];
+    [_hostButton sizeToFit];
+    
+     _hostButton.layer.shadowColor = [[UIColor blackColor] CGColor];
+    _hostButton.layer.shadowOffset = CGSizeMake(5,8);
+    _hostButton.layer.shadowOpacity = 0.7;
+    
+    _hostLabel = [[UILabel alloc] init];
+    _hostStatus = [[UILabel alloc] init];
+    _hostPairState = [[UILabel alloc] init];
+    [_hostLabel setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]];
+    [_hostStatus setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]];
+	[_hostPairState setFont:[UIFont fontWithName:@"Roboto-Regular" size:[UIFont systemFontSize]]];
+    return self;
+}
+
+- (id) initForAddWithCallback:(id<HostCallback>)callback {
+    self = [self init];
+    _callback = callback;
+    
+    [_hostButton setBackgroundImage:[UIImage imageNamed:@"Computer"] forState:UIControlStateNormal];
+    [_hostButton setContentEdgeInsets:UIEdgeInsetsMake(0, 4, 0, 4)];
+    [_hostButton addTarget:self action:@selector(addClicked) forControlEvents:UIControlEventTouchUpInside];
+    [_hostButton sizeToFit];
+    
+    [_hostLabel setText:@"Add Host"];
+    [_hostLabel sizeToFit];
+    _hostLabel.textColor = [UIColor whiteColor];
+    _hostLabel.center = CGPointMake(_hostButton.frame.origin.x + (_hostButton.frame.size.width / 2), _hostButton.frame.origin.y + _hostButton.frame.size.height + LABEL_DY);
+    
+    UIImageView* addIcon = [[UIImageView alloc] initWithImage:[UIImage imageNamed:@"AddComputerIcon"]];
+    [addIcon sizeToFit];
+    addIcon.center = CGPointMake(_hostButton.frame.origin.x + _hostButton.frame.size.width, _hostButton.frame.origin.y);
+    
+    // This is required to ensure this button is the same size as the others
+    _hostPairState.text = @"None";
+    _hostStatus.text = @"None";
+    [_hostPairState sizeToFit];
+    [_hostStatus sizeToFit];
+    
+    [self updateBounds];
+    [self addSubview:_hostButton];
+    [self addSubview:_hostLabel];
+    [self addSubview:addIcon];
+    
+    return self;
+}
+
+- (id) initWithComputer:(Host*)host andCallback:(id<HostCallback>)callback {
+    self = [self init];
+    _host = host;
+    _callback = callback;
+    
+    UILongPressGestureRecognizer* longPressRecognizer = [[UILongPressGestureRecognizer alloc] initWithTarget:self action:@selector(hostLongClicked)];
+    [_hostButton addGestureRecognizer:longPressRecognizer];
+    [_hostButton addTarget:self action:@selector(hostClicked) forControlEvents:UIControlEventTouchUpInside];
+    
+    [self updateContentsForHost:host];
+    [self updateBounds];
+    [self addSubview:_hostButton];
+    [self addSubview:_hostLabel];
+    [self addSubview:_hostStatus];
+    [self addSubview:_hostPairState];
+    [self startUpdateLoop];
+
+    return self;
+}
+
+- (void) updateBounds {
+    float x = FLT_MAX;
+    float y = FLT_MAX;
+    float width = 0;
+    float height;
+    
+    x = MIN(x, _hostButton.frame.origin.x);
+    x = MIN(x, _hostLabel.frame.origin.x);
+    x = MIN(x, _hostStatus.frame.origin.x);
+    x = MIN(x, _hostPairState.frame.origin.x);
+    
+    y = MIN(y, _hostButton.frame.origin.y);
+    y = MIN(y, _hostLabel.frame.origin.y);
+    y = MIN(y, _hostStatus.frame.origin.y);
+    y = MIN(y, _hostPairState.frame.origin.y);
+
+    width = MAX(width, _hostButton.frame.size.width);
+    width = MAX(width, _hostLabel.frame.size.width);
+    width = MAX(width, _hostStatus.frame.size.width);
+    width = MAX(width, _hostPairState.frame.size.width);
+    
+    height = _hostButton.frame.size.height +
+        _hostLabel.frame.size.height +
+        _hostStatus.frame.size.height +
+        _hostPairState.frame.size.height +
+        LABEL_DY / 2;
+    
+    self.bounds = CGRectMake(x, y, width, height);
+    self.frame = CGRectMake(x, y, width, height);
+}
+
+- (void) updateContentsForHost:(Host*)host {
+    _hostLabel.text = _host.name;
+    _hostLabel.textColor = [UIColor whiteColor];
+    [_hostLabel sizeToFit];
+    
+    switch (host.pairState) {
+        case PairStateUnknown:
+            _hostPairState.text = @"Pair State Unknown";
+            break;
+        case PairStateUnpaired:
+            _hostPairState.text = @"Not Paired";
+            break;
+        case PairStatePaired:
+            _hostPairState.text = @"Paired";
+            break;
+    }
+    _hostPairState.textColor = [UIColor whiteColor];
+    [_hostPairState sizeToFit];
+    
+    if (host.online) {
+        _hostStatus.text = @"Online";
+        _hostStatus.textColor = [UIColor greenColor];
+    } else {
+        _hostStatus.text = @"Offline";
+        _hostStatus.textColor = [UIColor grayColor];
+    }
+    [_hostStatus sizeToFit];
+    
+    float x = _hostButton.frame.origin.x + _hostButton.frame.size.width / 2;
+    _hostLabel.center = CGPointMake(x, _hostButton.frame.origin.y + _hostButton.frame.size.height + LABEL_DY);
+    _hostPairState.center = CGPointMake(x, _hostLabel.center.y + LABEL_DY);
+    _hostStatus.center = CGPointMake(x, _hostPairState.center.y + LABEL_DY);
+}
+
+- (void) startUpdateLoop {
+    [self performSelector:@selector(updateLoop) withObject:self afterDelay:REFRESH_CYCLE];
+}
+
+- (void) updateLoop {
+    [self updateContentsForHost:_host];
+    [self performSelector:@selector(updateLoop) withObject:self afterDelay:REFRESH_CYCLE];
+}
+
+- (void) hostLongClicked {
+    [_callback hostLongClicked:_host view:self];
+}
+
+- (void) hostClicked {
+    [_callback hostClicked:_host];
+}
+
+- (void) addClicked {
+    [_callback addHostClicked];
+}
+
+@end

Limelight/Utility/Computer.h

@@ -1,19 +0,0 @@
-//
-//  Computer.h
-//  Limelight
-//
-//  Created by Diego Waxemberg on 10/14/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
-//
-
-#import <Foundation/Foundation.h>
-
-@interface Computer : NSObject
-@property NSString* displayName;
-@property NSString* hostName;
-@property BOOL paired;
-
-- (id) initWithHost:(NSNetService*)host;
-- (id) initWithIp:(NSString*)host;
-
-@end

Limelight/Utility/Computer.m

@@ -1,31 +0,0 @@
-//
-//  Computer.m
-//  Limelight
-//
-//  Created by Diego Waxemberg on 10/14/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
-//
-
-#import "Computer.h"
-
-@implementation Computer
-
-- (id) initWithHost:(NSNetService *)host {
-    self = [super init];
-    
-    self.hostName = [host hostName];
-    self.displayName = [host name];
-    
-    return self;
-}
-
-- (id) initWithIp:(NSString*)host {
-    self = [super init];
-    
-    self.hostName = host;
-    self.displayName = host;
-    
-    return self;
-}
-
-@end

Limelight/Utility/Logger.h

@@ -0,0 +1,29 @@
+//
+//  Logger.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/10/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#ifndef Limelight_Logger_h
+#define Limelight_Logger_h
+
+#import <stdarg.h>
+
+typedef enum {
+    LOG_D,
+    LOG_I,
+    LOG_W,
+    LOG_E
+} LogLevel;
+
+#define PRFX_DEBUG @"<DEBUG>"
+#define PRFX_INFO @"<INFO>"
+#define PRFX_WARN @"<WARN>"
+#define PRFX_ERROR @"<ERROR>"
+
+void Log(LogLevel level, NSString* fmt, ...);
+void LogTag(LogLevel level, NSString* tag, NSString* fmt, ...);
+
+#endif

Limelight/Utility/Logger.m

@@ -0,0 +1,53 @@
+//
+//  Logger.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/10/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "Logger.h"
+
+void LogTagv(LogLevel level, NSString* tag, NSString* fmt, va_list args);
+
+void Log(LogLevel level, NSString* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    LogTagv(level, NULL, fmt, args);
+    va_end(args);
+}
+
+void LogTag(LogLevel level, NSString* tag, NSString* fmt, ...) {
+    va_list args;
+    va_start(args, fmt);
+    LogTagv(level, tag, fmt, args);
+    va_end(args);
+}
+
+void LogTagv(LogLevel level, NSString* tag, NSString* fmt, va_list args) {
+    NSString* levelPrefix = @"";
+    
+    switch(level) {
+        case LOG_D:
+            levelPrefix = PRFX_DEBUG;
+            break;
+        case LOG_I:
+            levelPrefix = PRFX_INFO;
+            break;
+        case LOG_W:
+            levelPrefix = PRFX_WARN;
+            break;
+        case LOG_E:
+            levelPrefix = PRFX_ERROR;
+            break;
+        default:
+            break;
+    }
+    NSString* prefixedString;
+    if (tag) {
+        prefixedString = [NSString stringWithFormat:@"%@ (%@) %@", levelPrefix, tag, fmt];
+    } else {
+        prefixedString = [NSString stringWithFormat:@"%@ %@", levelPrefix, fmt];
+    }
+    NSLogv(prefixedString, args);
+}

Limelight/Utility/Utils.h

@@ -10,6 +10,14 @@
 
 @interface Utils : NSObject
 
+typedef NS_ENUM(int, PairState) {
+    PairStateUnknown,
+    PairStateUnpaired,
+    PairStatePaired
+};
+
+FOUNDATION_EXPORT NSString *const deviceName;
+
 + (NSData*) randomBytes:(NSInteger)length;
 + (NSString*) bytesToHex:(NSData*)data;
 + (NSData*) hexToBytes:(NSString*) hex;

Limelight/Utility/Utils.m

@@ -13,6 +13,7 @@
 #include <netdb.h>
 
 @implementation Utils
+NSString *const deviceName = @"roth";
 
 + (NSData*) randomBytes:(NSInteger)length {
     char* bytes = malloc(length);
@@ -55,19 +56,19 @@
     if (inet_addr([host UTF8String]) != INADDR_NONE) {
         // Already an IP address
         int addr = inet_addr([host UTF8String]);
-        NSLog(@"host address: %d", addr);
+        Log(LOG_I, @"host address: %d", addr);
         return addr;
     } else {
         hostent = gethostbyname([host UTF8String]);
         if (hostent != NULL) {
             char* ipstr = inet_ntoa(*(struct in_addr*)hostent->h_addr_list[0]);
-            NSLog(@"Resolved %@ -> %s", host, ipstr);
+            Log(LOG_I, @"Resolved %@ -> %s", host, ipstr);
             int addr = inet_addr(ipstr);
-            NSLog(@"host address: %d", addr);
+            Log(LOG_I, @"host address: %d", addr);
             return addr;
         } else {
-            NSLog(@"Failed to resolve host: %d", h_errno);
-            return -1;
+            Log(LOG_W, @"Failed to resolve host: %d", h_errno);
+            return 0;
         }
     }
 }

Limelight/ViewControllers/LoadingFrameViewController.h

@@ -0,0 +1,14 @@
+//
+//  LoadingFrameViewController.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/24/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+
+@interface LoadingFrameViewController : UIViewController
+
+@property (weak, nonatomic) IBOutlet UIActivityIndicatorView *loadingSpinner;
+@end

Limelight/ViewControllers/LoadingFrameViewController.m

@@ -0,0 +1,38 @@
+//
+//  LoadingFrameViewController.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 2/24/15.
+//  Copyright (c) 2015 Limelight Stream. All rights reserved.
+//
+
+#import "LoadingFrameViewController.h"
+
+@interface LoadingFrameViewController ()
+
+@end
+
+@implementation LoadingFrameViewController
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    // center the loading spinner
+    self.loadingSpinner.center = CGPointMake(self.view.frame.size.width / 2, self.view.frame.size.height / 2);
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+/*
+#pragma mark - Navigation
+
+// In a storyboard-based application, you will often want to do a little preparation before navigation
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    // Get the new view controller using [segue destinationViewController].
+    // Pass the selected object to the new view controller.
+}
+*/
+
+@end

Limelight/ViewControllers/MainFrameViewController.h

@@ -7,20 +7,17 @@
 //
 
 #import <UIKit/UIKit.h>
-#import "MDNSManager.h"
+#import "DiscoveryManager.h"
 #import "PairManager.h"
 #import "StreamConfiguration.h"
+#import "UIComputerView.h"
+#import "UIAppView.h"
+#import "AppAssetManager.h"
+#import "SWRevealViewController.h"
 
-@interface MainFrameViewController : UIViewController <UIPickerViewDataSource, UIPickerViewDelegate, MDNSCallback, NSURLConnectionDelegate, PairCallback, UITextFieldDelegate>
-@property (strong, nonatomic) IBOutlet UIPickerView *HostPicker;
-- (IBAction)StreamButton:(UIButton *)sender;
-- (IBAction)PairButton:(UIButton *)sender;
+@interface MainFrameViewController : UICollectionViewController <DiscoveryCallback, PairCallback, HostCallback, AppCallback, AppAssetCallback, NSURLConnectionDelegate, SWRevealViewControllerDelegate>
 
-@property (strong, nonatomic) IBOutlet UIPickerView *StreamConfigs;
-@property (strong, nonatomic) NSArray* streamConfigVals;
-@property (strong, nonatomic) NSArray* hostPickerVals;
-@property (strong, nonatomic) IBOutlet UITextField *hostTextField;
-
-+ (StreamConfiguration*) getStreamConfiguration;
+@property (strong, nonatomic) IBOutlet UIButton *limelightLogoButton;
+@property (weak, nonatomic) IBOutlet UIBarButtonItem *computerNameButton;
 
 @end

Limelight/ViewControllers/MainFrameViewController.m

@@ -1,4 +1,3 @@
-//
 //  MainFrameViewController.m
 //  Limelight-iOS
 //
@@ -7,42 +6,38 @@
 //
 
 #import "MainFrameViewController.h"
-#import "Computer.h"
 #import "CryptoManager.h"
 #import "HttpManager.h"
 #import "Connection.h"
-#import "VideoDecoderRenderer.h"
 #import "StreamManager.h"
 #import "Utils.h"
+#import "UIComputerView.h"
+#import "UIAppView.h"
+#import "App.h"
+#import "SettingsViewController.h"
+#import "DataManager.h"
+#import "Settings.h"
+#import "WakeOnLanManager.h"
+#import "AppListResponse.h"
+#import "ServerInfoResponse.h"
+#import "StreamFrameViewController.h"
+#import "LoadingFrameViewController.h"
 
 @implementation MainFrameViewController {
     NSOperationQueue* _opQueue;
-    MDNSManager* _mDNSManager;
-    Computer* _selectedHost;
+    Host* _selectedHost;
+    NSString* _uniqueId;
+    NSData* _cert;
+    NSString* _currentGame;
+    DiscoveryManager* _discMan;
+    AppAssetManager* _appManager;
+    StreamConfiguration* _streamConfig;
     UIAlertView* _pairAlert;
+    UIScrollView* hostScrollView;
+    int currentPosition;
 }
-static StreamConfiguration* streamConfig;
-
-+ (StreamConfiguration*) getStreamConfiguration {
-    return streamConfig;
-}
-
-- (void)PairButton:(UIButton *)sender
-{
-    NSLog(@"Pair Button Pressed!");
-    if ([self.hostTextField.text length] > 0) {
-        _selectedHost = [[Computer alloc] initWithIp:self.hostTextField.text];
-        NSLog(@"Using custom host: %@", self.hostTextField.text);
-    }
-    [CryptoManager generateKeyPairUsingSSl];
-    NSString* uniqueId = [CryptoManager getUniqueID];
-    NSData* cert = [CryptoManager readCertFromFile];
-    
-    HttpManager* hMan = [[HttpManager alloc] initWithHost:_selectedHost.hostName uniqueId:uniqueId deviceName:@"roth" cert:cert];
-    PairManager* pMan = [[PairManager alloc] initWithManager:hMan andCert:cert callback:self];
-
-    [_opQueue addOperation:pMan];
-}
+static NSMutableSet* hostList;
+static NSArray* appList;
 
 - (void)showPIN:(NSString *)PIN {
     dispatch_sync(dispatch_get_main_queue(), ^{
@@ -56,6 +51,8 @@ static StreamConfiguration* streamConfig;
         [_pairAlert dismissWithClickedButtonIndex:0 animated:NO];
         _pairAlert = [[UIAlertView alloc] initWithTitle:@"Pairing Failed" message:message delegate:self cancelButtonTitle:@"Ok" otherButtonTitles:nil, nil];
         [_pairAlert show];
+        [_discMan startDiscovery];
+        [self hideLoadingFrame];
     });
 }
 
@@ -64,117 +61,412 @@ static StreamConfiguration* streamConfig;
         [_pairAlert dismissWithClickedButtonIndex:0 animated:NO];
         _pairAlert = [[UIAlertView alloc] initWithTitle:@"Pairing Succesful" message:@"Successfully paired to host" delegate:self cancelButtonTitle:@"Ok" otherButtonTitles:nil, nil];
         [_pairAlert show];
+        [_discMan startDiscovery];
+        [self hideLoadingFrame];
     });
 }
 
-- (void)StreamButton:(UIButton *)sender
-{
-    NSLog(@"Stream Button Pressed!");
-    if ([self.hostTextField.text length] > 0) {
-        _selectedHost = [[Computer alloc] initWithIp:self.hostTextField.text];
-        NSLog(@"Using custom host: %@", self.hostTextField.text);
-    }
-    streamConfig = [[StreamConfiguration alloc] init];
-    streamConfig.host = _selectedHost.hostName;
-    streamConfig.hostAddr = [Utils resolveHost:_selectedHost.hostName];
-    
-    unsigned long selectedConf = [self.StreamConfigs selectedRowInComponent:0];
-    NSLog(@"selectedConf: %ld", selectedConf);
-    switch (selectedConf) {
-        case 0:
-            streamConfig.width = 1280;
-            streamConfig.height = 720;
-            streamConfig.frameRate = 30;
-            break;
-        case 1:
-            streamConfig.width = 1280;
-            streamConfig.height = 720;
-            streamConfig.frameRate = 60;
-            break;
-        case 2:
-            streamConfig.width = 1920;
-            streamConfig.height = 1080;
-            streamConfig.frameRate = 30;
-            break;
-        case 3:
-            streamConfig.width = 1920;
-            streamConfig.height = 1080;
-            streamConfig.frameRate = 60;
-            break;
-        default:
-            streamConfig.width = 1280;
-            streamConfig.height = 720;
-            streamConfig.frameRate = 60;
-            break;
-    }
-    NSLog(@"StreamConfig: %@, %d, %dx%dx%d", streamConfig.host, streamConfig.hostAddr, streamConfig.width, streamConfig.height, streamConfig.frameRate);
-    [self performSegueWithIdentifier:@"createStreamFrame" sender:self];
+- (void)alreadyPaired {
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        dispatch_async(dispatch_get_main_queue(), ^{
+            _computerNameButton.title = _selectedHost.name;
+            [self.navigationController.navigationBar setNeedsLayout];
+        });
+        HttpManager* hMan = [[HttpManager alloc] initWithHost:_selectedHost.address uniqueId:_uniqueId deviceName:deviceName cert:_cert];
+        
+        AppListResponse* appListResp = [[AppListResponse alloc] init];
+        [hMan executeRequestSynchronously:[HttpRequest requestForResponse:appListResp withUrlRequest:[hMan newAppListRequest]]];
+        if (appListResp == nil || ![appListResp isStatusOk]) {
+            Log(LOG_W, @"Failed to get applist: %@", appListResp.statusMessage);
+        } else {
+            appList = [appListResp getAppList];
+            if (appList == nil) {
+                Log(LOG_W, @"Failed to parse applist");
+            } else {
+                dispatch_async(dispatch_get_main_queue(), ^{
+                    [self updateApps];
+                });
+                
+                [_appManager stopRetrieving];
+                [_appManager retrieveAssets:appList fromHost:_selectedHost];
+            }
+        }
+        [self hideLoadingFrame];
+    });
 }
 
-- (NSString *)pickerView:(UIPickerView *)pickerView titleForRow:(NSInteger)row forComponent:(NSInteger)component
-{
-    if (pickerView == self.StreamConfigs) {
-        return [self.streamConfigVals objectAtIndex:row];
-    } else if (pickerView == self.HostPicker) {
-        return ((Computer*)([self.hostPickerVals objectAtIndex:row])).displayName;
+- (void)showHostSelectionView {
+    appList = [[NSArray alloc] init];
+    [_appManager stopRetrieving];
+    _computerNameButton.title = @"No Host Selected";
+    [self.collectionView reloadData];
+    [self.view addSubview:hostScrollView];
+}
+
+- (void) receivedAssetForApp:(App*)app {
+    [self.collectionView reloadData];
+}
+
+- (void)displayDnsFailedDialog {
+    UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Network Error"
+                                                                   message:@"Failed to resolve host."
+                                                            preferredStyle:UIAlertControllerStyleAlert];
+    [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:nil]];
+    [self presentViewController:alert animated:YES completion:nil];
+}
+
+- (void) hostClicked:(Host *)host {
+    Log(LOG_D, @"Clicked host: %@", host.name);
+    [self showLoadingFrame];
+    _selectedHost = host;
+    dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+        HttpManager* hMan = [[HttpManager alloc] initWithHost:host.address uniqueId:_uniqueId deviceName:deviceName cert:_cert];
+        ServerInfoResponse* serverInfoResp = [[ServerInfoResponse alloc] init];
+        [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResp withUrlRequest:[hMan newServerInfoRequest]]];
+        if (serverInfoResp == nil || ![serverInfoResp isStatusOk]) {
+            Log(LOG_W, @"Failed to get server info: %@", serverInfoResp.statusMessage);
+            [self hideLoadingFrame];
+        } else {
+            Log(LOG_D, @"server info pair status: %@", [serverInfoResp getStringTag:@"PairStatus"]);
+            if ([[serverInfoResp getStringTag:@"PairStatus"] isEqualToString:@"1"]) {
+                Log(LOG_I, @"Already Paired");
+                [self alreadyPaired];
+            } else {
+                Log(LOG_I, @"Trying to pair");
+                // Polling the server while pairing causes the server to screw up
+                [_discMan stopDiscoveryBlocking];
+                PairManager* pMan = [[PairManager alloc] initWithManager:hMan andCert:_cert callback:self];
+                [_opQueue addOperation:pMan];
+            }
+        }
+    });
+}
+
+- (void)hostLongClicked:(Host *)host view:(UIView *)view {
+    Log(LOG_D, @"Long clicked host: %@", host.name);
+    UIAlertController* longClickAlert = [UIAlertController alertControllerWithTitle:host.name message:@"" preferredStyle:UIAlertControllerStyleActionSheet];
+    if (host.online) {
+        [longClickAlert addAction:[UIAlertAction actionWithTitle:@"Unpair" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
+            dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                HttpManager* hMan = [[HttpManager alloc] initWithHost:host.address uniqueId:_uniqueId deviceName:deviceName cert:_cert];
+                [hMan executeRequest:[HttpRequest requestWithUrlRequest:[hMan newUnpairRequest]]];
+            });
+        }]];
     } else {
-        return nil;
+        [longClickAlert addAction:[UIAlertAction actionWithTitle:@"Wake" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
+            UIAlertController* wolAlert = [UIAlertController alertControllerWithTitle:@"Wake On Lan" message:@"" preferredStyle:UIAlertControllerStyleAlert];
+            [wolAlert addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:nil]];
+            if (host.pairState != PairStatePaired) {
+                wolAlert.message = @"Cannot wake host because you are not paired";
+            } else if (host.mac == nil || [host.mac isEqualToString:@"00:00:00:00:00:00"]) {
+                wolAlert.message = @"Host MAC unknown, unable to send WOL Packet";
+            } else {
+                dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                    [WakeOnLanManager wakeHost:host];
+                });
+                wolAlert.message = @"Sent WOL Packet";
+            }
+            [self presentViewController:wolAlert animated:YES completion:nil];
+        }]];
     }
+    [longClickAlert addAction:[UIAlertAction actionWithTitle:@"Remove Host" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action) {
+        [_discMan removeHostFromDiscovery:host];
+        DataManager* dataMan = [[DataManager alloc] init];
+        [dataMan removeHost:host];
+        @synchronized(hostList) {
+            [hostList removeObject:host];
+        }
+        [self updateAllHosts:[hostList allObjects]];
+        
+    }]];
+    [longClickAlert addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
+    
+    // these two lines are required for iPad support of UIAlertSheet
+    longClickAlert.popoverPresentationController.sourceView = view;
+    
+    longClickAlert.popoverPresentationController.sourceRect = CGRectMake(view.bounds.size.width / 2.0, view.bounds.size.height / 2.0, 1.0, 1.0); // center of the view
+    [self presentViewController:longClickAlert animated:YES completion:^{
+        [self updateHosts];
+    }];
 }
 
-- (void)pickerView:(UIPickerView *)pickerView didSelectRow:(NSInteger)row inComponent:(NSInteger)component
-{
-    if (pickerView == self.HostPicker) {
-        _selectedHost = (Computer*)([self.hostPickerVals objectAtIndex:[self.HostPicker selectedRowInComponent:0]]);
+- (void) addHostClicked {
+    Log(LOG_D, @"Clicked add host");
+    [self showLoadingFrame];
+    UIAlertController* alertController = [UIAlertController alertControllerWithTitle:@"Host Address" message:@"Please enter a hostname or IP address" preferredStyle:UIAlertControllerStyleAlert];
+    [alertController addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
+    [alertController addAction:[UIAlertAction actionWithTitle:@"OK" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
+        NSString* hostAddress = ((UITextField*)[[alertController textFields] objectAtIndex:0]).text;
+        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_HIGH, 0), ^{
+            [_discMan discoverHost:hostAddress withCallback:^(Host* host, NSString* error){
+                if (host != nil) {
+                    DataManager* dataMan = [[DataManager alloc] init];
+                    [dataMan saveHosts];
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        @synchronized(hostList) {
+                            [hostList addObject:host];
+                        }
+                        [self updateHosts];
+                    });
+                } else {
+                    UIAlertController* hostNotFoundAlert = [UIAlertController alertControllerWithTitle:@"Add Host" message:error preferredStyle:UIAlertControllerStyleAlert];
+                    [hostNotFoundAlert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:nil]];
+                    dispatch_async(dispatch_get_main_queue(), ^{
+                        [self presentViewController:hostNotFoundAlert animated:YES completion:nil];
+                    });
+                }
+            }];});
+    }]];
+    [alertController addTextFieldWithConfigurationHandler:nil];
+    [self hideLoadingFrame];
+    [self presentViewController:alertController animated:YES completion:nil];
+}
+
+- (void) appClicked:(App *)app {
+    Log(LOG_D, @"Clicked app: %@", app.appName);
+    _streamConfig = [[StreamConfiguration alloc] init];
+    _streamConfig.host = _selectedHost.address;
+    _streamConfig.hostAddr = [Utils resolveHost:_selectedHost.address];
+    _streamConfig.appID = app.appId;
+    if (_streamConfig.hostAddr == 0) {
+        [self displayDnsFailedDialog];
+        return;
     }
     
-    //TODO: figure out how to save this info!!
-}
-
-// returns the number of 'columns' to display.
-- (NSInteger)numberOfComponentsInPickerView:(UIPickerView *)pickerView
-{
-    return 1;
-}
-
-// returns the # of rows in each component..
-- (NSInteger)pickerView:(UIPickerView *)pickerView numberOfRowsInComponent:(NSInteger)component
-{
-    if (pickerView == self.StreamConfigs) {
-        return self.streamConfigVals.count;
-    } else if (pickerView == self.HostPicker) {
-        return self.hostPickerVals.count;
-    } else {
-        return 0;
+    DataManager* dataMan = [[DataManager alloc] init];
+    Settings* streamSettings = [dataMan retrieveSettings];
+    
+    _streamConfig.frameRate = [streamSettings.framerate intValue];
+    _streamConfig.bitRate = [streamSettings.bitrate intValue];
+    _streamConfig.height = [streamSettings.height intValue];
+    _streamConfig.width = [streamSettings.width intValue];
+    
+    
+    if (currentPosition != FrontViewPositionLeft) {
+        [[self revealViewController] revealToggle:self];
     }
+    
+    App* currentApp = [self findRunningApp];
+    if (currentApp != nil) {
+        UIAlertController* alertController = [UIAlertController
+                                              alertControllerWithTitle: app.appName
+                                              message: [app.appId isEqualToString:currentApp.appId] ? @"" : [NSString stringWithFormat:@"%@ is currently running", currentApp.appName]preferredStyle:UIAlertControllerStyleAlert];
+        [alertController addAction:[UIAlertAction
+                                    actionWithTitle:[app.appId isEqualToString:currentApp.appId] ? @"Resume App" : @"Resume Running App" style:UIAlertActionStyleDefault handler:^(UIAlertAction* action){
+                                        Log(LOG_I, @"Resuming application: %@", currentApp.appName);
+                                        [self performSegueWithIdentifier:@"createStreamFrame" sender:nil];
+                                    }]];
+        [alertController addAction:[UIAlertAction actionWithTitle:
+                                    [app.appId isEqualToString:currentApp.appId] ? @"Quit App" : @"Quit Running App and Start" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action){
+                                        Log(LOG_I, @"Quitting application: %@", currentApp.appName);
+                                        dispatch_async(dispatch_get_global_queue(DISPATCH_QUEUE_PRIORITY_DEFAULT, 0), ^{
+                                            HttpManager* hMan = [[HttpManager alloc] initWithHost:_selectedHost.address uniqueId:_uniqueId deviceName:deviceName cert:_cert];
+                                            [hMan executeRequestSynchronously:[HttpRequest requestWithUrlRequest:[hMan newQuitAppRequest]]];
+                                            // TODO: handle failure to quit app
+                                            currentApp.isRunning = NO;
+                                            
+                                            if (![app.appId isEqualToString:currentApp.appId]) {
+                                                dispatch_async(dispatch_get_main_queue(), ^{
+                                                    [self performSegueWithIdentifier:@"createStreamFrame" sender:nil];
+                                                });
+                                            }
+                                        });
+                                    }]];
+        [alertController addAction:[UIAlertAction actionWithTitle:@"Cancel" style:UIAlertActionStyleCancel handler:nil]];
+        [self presentViewController:alertController animated:YES completion:nil];
+    } else {
+        [self performSegueWithIdentifier:@"createStreamFrame" sender:nil];
+    }
+}
+
+- (App*) findRunningApp {
+    for (App* app in appList) {
+        if (app.isRunning) {
+            return app;
+        }
+    }
+    return nil;
+}
+
+- (void)revealController:(SWRevealViewController *)revealController didMoveToPosition:(FrontViewPosition)position {
+    // If we moved back to the center position, we should save the settings
+    if (position == FrontViewPositionLeft) {
+        [(SettingsViewController*)[revealController rearViewController] saveSettings];
+    }
+    currentPosition = position;
+}
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+    if ([segue.destinationViewController isKindOfClass:[StreamFrameViewController class]]) {
+        StreamFrameViewController* streamFrame = segue.destinationViewController;
+        streamFrame.streamConfig = _streamConfig;
+    }
+}
+
+- (void) showLoadingFrame {
+    LoadingFrameViewController* loadingFrame = [self.storyboard instantiateViewControllerWithIdentifier:@"loadingFrame"];
+    [self.navigationController presentViewController:loadingFrame animated:YES completion:nil];
+}
+
+- (void) hideLoadingFrame {
+    [self dismissViewControllerAnimated:YES completion:nil];
 }
 
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-
-    self.streamConfigVals = [[NSArray alloc] initWithObjects:@"1280x720 (30Hz)", @"1280x720 (60Hz)", @"1920x1080 (30Hz)", @"1920x1080 (60Hz)",nil];
-    self.hostPickerVals = [[NSArray alloc] init];
-    [self.StreamConfigs selectRow:1 inComponent:0 animated:NO];
     
+    // Set the side bar button action. When it's tapped, it'll show the sidebar.
+    [_limelightLogoButton addTarget:self.revealViewController action:@selector(revealToggle:) forControlEvents:UIControlEventTouchDown];
+    
+    // Set the host name button action. When it's tapped, it'll show the host selection view.
+    [_computerNameButton setTarget:self];
+    [_computerNameButton setAction:@selector(showHostSelectionView)];
+    
+    // Set the gesture
+    [self.view addGestureRecognizer:self.revealViewController.panGestureRecognizer];
+    
+    // Get callbacks associated with the viewController
+    [self.revealViewController setDelegate:self];
+    
+    // Set the current position to the center
+    currentPosition = FrontViewPositionLeft;
+    
+    // Set up crypto
+    [CryptoManager generateKeyPairUsingSSl];
+    _uniqueId = [CryptoManager getUniqueID];
+    _cert = [CryptoManager readCertFromFile];
+
+    _appManager = [[AppAssetManager alloc] initWithCallback:self];
     _opQueue = [[NSOperationQueue alloc] init];
+    
+    // Only initialize the host picker list once
+    if (hostList == nil) {
+        hostList = [[NSMutableSet alloc] init];
+    }
+    
+    [self setAutomaticallyAdjustsScrollViewInsets:NO];
+    
+    hostScrollView = [[UIScrollView alloc] init];
+    hostScrollView.frame = CGRectMake(0, self.navigationController.navigationBar.frame.origin.y + self.navigationController.navigationBar.frame.size.height, self.view.frame.size.width, self.view.frame.size.height / 2);
+    [hostScrollView setShowsHorizontalScrollIndicator:NO];
+    
+    [self retrieveSavedHosts];
+    _discMan = [[DiscoveryManager alloc] initWithHosts:[hostList allObjects] andCallback:self];
+    
+    [self updateHosts];
+    [self.view addSubview:hostScrollView];
 }
 
 - (void)viewDidAppear:(BOOL)animated
 {
-    _mDNSManager = [[MDNSManager alloc] initWithCallback:self];
-    [_mDNSManager searchForHosts];
+    [super viewDidAppear:animated];
+    [self.navigationController setNavigationBarHidden:NO animated:YES];
+    
+    // Hide 1px border line
+    UIImage* fakeImage = [[UIImage alloc] init];
+    [self.navigationController.navigationBar setShadowImage:fakeImage];
+    [self.navigationController.navigationBar setBackgroundImage:fakeImage forBarPosition:UIBarPositionAny barMetrics:UIBarMetricsDefault];
+    
+    [_discMan startDiscovery];
+    
+    // This will refresh the applist
+    if (_selectedHost != nil) {
+        [self hostClicked:_selectedHost];
+    }
 }
 
 - (void)viewDidDisappear:(BOOL)animated
 {
-    [_mDNSManager stopSearching];
+    [super viewDidDisappear:animated];
+    // when discovery stops, we must create a new instance because you cannot restart an NSOperation when it is finished
+    [_discMan stopDiscovery];
+    
+    // In case the host objects were updated in the background
+    [[[DataManager alloc] init] saveHosts];
 }
 
-- (void)updateHosts:(NSArray *)hosts {
-    self.hostPickerVals = hosts;
-    [self.HostPicker reloadAllComponents];
-    _selectedHost = (Computer*)([self.hostPickerVals objectAtIndex:[self.HostPicker selectedRowInComponent:0]]);
+- (void) retrieveSavedHosts {
+    DataManager* dataMan = [[DataManager alloc] init];
+    NSArray* hosts = [dataMan retrieveHosts];
+    @synchronized(hostList) {
+        [hostList addObjectsFromArray:hosts];
+    }
+}
+
+- (void) updateAllHosts:(NSArray *)hosts {
+    dispatch_async(dispatch_get_main_queue(), ^{
+        Log(LOG_D, @"New host list:");
+        for (Host* host in hosts) {
+            Log(LOG_D, @"Host: \n{\n\t name:%@ \n\t address:%@ \n\t localAddress:%@ \n\t externalAddress:%@ \n\t uuid:%@ \n\t mac:%@ \n\t pairState:%d \n\t online:%d \n}", host.name, host.address, host.localAddress, host.externalAddress, host.uuid, host.mac, host.pairState, host.online);
+        }
+        @synchronized(hostList) {
+            [hostList removeAllObjects];
+            [hostList addObjectsFromArray:hosts];
+        }
+        [self updateHosts];
+    });
+}
+
+- (void)updateHosts {
+    Log(LOG_I, @"Updating hosts...");
+    [[hostScrollView subviews] makeObjectsPerformSelector:@selector(removeFromSuperview)];
+    UIComputerView* addComp = [[UIComputerView alloc] initForAddWithCallback:self];
+    UIComputerView* compView;
+    float prevEdge = -1;
+    @synchronized (hostList) {
+        for (Host* comp in hostList) {
+            compView = [[UIComputerView alloc] initWithComputer:comp andCallback:self];
+            compView.center = CGPointMake([self getCompViewX:compView addComp:addComp prevEdge:prevEdge], hostScrollView.frame.size.height / 2);
+            prevEdge = compView.frame.origin.x + compView.frame.size.width;
+            [hostScrollView addSubview:compView];
+        }
+    }
+    prevEdge = [self getCompViewX:addComp addComp:addComp prevEdge:prevEdge];
+    addComp.center = CGPointMake(prevEdge, hostScrollView.frame.size.height / 2);
+    
+    [hostScrollView addSubview:addComp];
+    [hostScrollView setContentSize:CGSizeMake(prevEdge + addComp.frame.size.width, hostScrollView.frame.size.height)];
+}
+
+- (float) getCompViewX:(UIComputerView*)comp addComp:(UIComputerView*)addComp prevEdge:(float)prevEdge {
+    if (prevEdge == -1) {
+        return hostScrollView.frame.origin.x + comp.frame.size.width / 2 + addComp.frame.size.width / 2;
+    } else {
+        return prevEdge + addComp.frame.size.width / 2  + comp.frame.size.width / 2;
+    }
+}
+
+- (void) updateApps {
+    [hostScrollView removeFromSuperview];
+    [self.collectionView reloadData];
+}
+
+- (UICollectionViewCell *)collectionView:(UICollectionView *)collectionView cellForItemAtIndexPath:(NSIndexPath *)indexPath {
+    UICollectionViewCell* cell = [collectionView dequeueReusableCellWithReuseIdentifier:@"AppCell" forIndexPath:indexPath];
+    
+    App* app = appList[indexPath.row];
+    UIAppView* appView = [[UIAppView alloc] initWithApp:app andCallback:self];
+    [appView updateAppImage];
+    
+    if (appView.bounds.size.width > 10.0) {
+        CGFloat scale = cell.bounds.size.width / appView.bounds.size.width;
+        [appView setCenter:CGPointMake(appView.bounds.size.width / 2 * scale, appView.bounds.size.height / 2 * scale)];
+        appView.transform = CGAffineTransformMakeScale(scale, scale);
+    }
+    
+    [cell.subviews.firstObject removeFromSuperview]; // Remove a view that was previously added
+    [cell addSubview:appView];
+    
+    return cell;
+}
+
+- (NSInteger)numberOfSectionsInCollectionView:(UICollectionView *)collectionView {
+    return 1; // App collection only
+}
+
+- (NSInteger)collectionView:(UICollectionView *)collectionView numberOfItemsInSection:(NSInteger)section {
+    return appList.count;
 }
 
 - (void)didReceiveMemoryWarning
@@ -196,21 +488,4 @@ static StreamConfiguration* streamConfig;
     return YES;
 }
 
-- (NSUInteger)supportedInterfaceOrientations {
-    NSString *deviceType = [UIDevice currentDevice].model;
-    if ([deviceType containsString:@"iPhone"] || [deviceType containsString:@"iPod"]) {
-        return UIInterfaceOrientationMaskPortrait | UIInterfaceOrientationMaskPortraitUpsideDown;
-    } else {
-        return UIInterfaceOrientationMaskLandscapeLeft | UIInterfaceOrientationMaskLandscapeRight;
-    }
-}
-
-- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
-    NSString *deviceType = [UIDevice currentDevice].model;
-    if ([deviceType containsString:@"iPhone"] || [deviceType containsString:@"iPod"]) {
-        return UIInterfaceOrientationPortrait;
-    } else {
-        return UIInterfaceOrientationLandscapeRight;
-    }
-}
 @end

Limelight/ViewControllers/SWRevealViewController.h

@@ -0,0 +1,418 @@
+/*
+
+ Copyright (c) 2013 Joan Lluch <[email protected]>
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is furnished
+ to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+ Early code inspired on a similar class by Philip Kluz ([email protected])
+ 
+*/
+
+/*
+
+ RELEASE NOTES
+ 
+ 
+ Version 2.3.0 (Current Version)
+ 
+  - StoryBoard initializing bug fix
+  - Minor Code refactoring
+ 
+ Version 2.2.0
+ 
+ - State Restoration support.
+ - Reverted panGestureRecognizer implementation to before v2.1.0 (works better).
+ - New properties 'toggleAnimationType', 'springDampingRatio'. Default reveal animation is 'Spring'
+ - New property 'frontViewShadowColor'
+ - New properties 'clipsViewsToBounds' and '_extendedPointInsideHit'
+ - New delegate methods for finer control of front view location in the overdraw area, as long as deprecation note on former delegate methods
+ - Other minor changes that should not affect current implementations
+ 
+ Version 2.1.0
+ 
+ - Removed SWDirectionPanGestureRecognizer. Horizontal panning is filtered on the shouldBegin delegate. This is cleaner, I hope it does not break previous funcionality
+ - Took a cleaner approach to storyboard support. SWRevealViewControllerSegue is now deprecated and you should use SWRevealViewControllerSegueSetController and SWRevealViewControllerSeguePushController instead.
+ - A minor change on the autoresizingMask of the internal views to fix a glitch on iOS8. This should not affect iOS7
+ 
+ Version 2.0.2
+ 
+ - Added new delegates for better control of gesture recognizers
+ 
+ Version 2.0.1
+ 
+ - Fix: draggableBorderWidth now correctly handles the cases where one of the rear controllers is not provided
+ - Fix: the shadow related properties are now granted at any time after view load, not just after initialization.
+ 
+ Version 2.0.0
+ 
+- Dropped support for iOS6 and earlier. This version will only work on iOS7
+ 
+- The method setFrontViewController:animated: does not longer perform a full reveal animation. Instead it just replaces the frontViewController in 
+    its current position. Use the new pushFrontViewController:animated: method to perform a replacement of the front controlles with reveal animation
+    as in the previous version
+    
+    IMPORTANT: You must replace all calls to setFrontViewController:animated by calls to pushFrontViewController:animated to prevent breaking
+    functionality on existing projects.
+ 
+- Added support for animated replacement of child controllers: setRearViewController, setFrontViewController, setRightViewController now have animated versions.
+ 
+- The new 'replaceViewAnimationDuration' property sets the default duration of child viewController replacement.
+ 
+- Added the following new delegate methods
+    revealController:willAddViewController:forOperation:animated:
+    revealController:didAddViewController:forOperation:animated:
+
+- The class also supports custom UIViewControllerAnimatedTransitioning related with the replacement of child viewControllers.
+    You can implement the following new delegate method: revealController:animationControllerForOperation:fromViewController:toViewController:
+    and provide an object conforming to UIViewControllerAnimatedTransitioning to implement custom animations.
+ 
+ Version 1.1.3
+ 
+- Reverted the supportedInterfaceOrientations to the default behavior. This is consistent with Apple provided controllers
+
+- The presentFrontViewHierarchically now dynamically takes into account the smaller header height of bars on iPhone landscape orientation
+ 
+ Version 1.1.2
+ 
+ - The status bar style and appearance are now handled in sync with the class animations. 
+    You can implement the methods preferredStatusBarStyle and prefersStatusBarHidden on your child controllers to define the desired appearance
+    
+ - The loadView method now calls a method, loadStoryboardControllers, just for the purpose of loading child controllers from a storyboard.
+    You can override this method and remove the @try @catch statements if you want the debugger not to stop at them in case you have set an exception breakpoint.
+ 
+ Version 1.1.1
+ 
+ - You can now get a tapGestureRecognizer from the class. See the tapGestureRecognizer method for more information.
+ 
+ - Both the panGestureRecognizer and the tapGestureRecognizer are now attached to the revealViewController's front content view
+    by default, so they will start working just by calling their access methods even if you do not attach them to any of your views.
+    This enables you to dissable interactions on your views -for example based on position- without breaking normal gesture behavior.
+ 
+ - Corrected a bug that caused a crash on iOS6 and earlier.
+ 
+ Version 1.1.0
+
+ - The method setFrontViewController:animated now performs the correct animations both for left and right controllers.
+
+ - The class now automatically handles the status bar appearance depending on the currently shown child controller.
+
+ Version 1.0.8
+ 
+ - Support for constant width frontView by setting a negative value to reveal widths. See properties rearViewRevealWidth and rightViewRevealWidth
+ 
+ - Support for draggableBorderWidth. See property of the same name.
+ 
+ - The Pan gesture recongnizer can be disabled by implementing the following delegate method and returning NO
+    revealControllerPanGestureShouldBegin:
+
+ - Added the ability to track pan gesture reveal progress through the following new delegate methods
+    revealController:panGestureBeganFromLocation:progress:
+    revealController:panGestureMovedToLocation:progress:
+    revealController:panGestureEndedToLocation:progress:
+ 
+ Previous Versions
+ 
+ - No release notes were updated for previous versions.
+
+*/
+
+
+#import <UIKit/UIKit.h>
+
+@class SWRevealViewController;
+@protocol SWRevealViewControllerDelegate;
+
+#pragma mark - SWRevealViewController Class
+
+// Enum values for setFrontViewPosition:animated:
+typedef NS_ENUM( NSInteger, FrontViewPosition)
+{
+    // Front controller is removed from view. Animated transitioning from this state will cause the same
+    // effect than animating from FrontViewPositionLeftSideMost. Use this instead of FrontViewPositionLeftSideMost when
+    // you want to remove the front view controller view from the view hierarchy.
+    FrontViewPositionLeftSideMostRemoved,
+    
+    // Left most position, front view is presented left-offseted by rightViewRevealWidth+rigthViewRevealOverdraw
+    FrontViewPositionLeftSideMost,
+    
+    // Left position, front view is presented left-offseted by rightViewRevealWidth
+    FrontViewPositionLeftSide,
+
+    // Center position, rear view is hidden behind front controller
+	FrontViewPositionLeft,
+    
+    // Right possition, front view is presented right-offseted by rearViewRevealWidth
+	FrontViewPositionRight,
+    
+    // Right most possition, front view is presented right-offseted by rearViewRevealWidth+rearViewRevealOverdraw
+	FrontViewPositionRightMost,
+    
+    // Front controller is removed from view. Animated transitioning from this state will cause the same
+    // effect than animating from FrontViewPositionRightMost. Use this instead of FrontViewPositionRightMost when
+    // you intent to remove the front controller view from the view hierarchy.
+    FrontViewPositionRightMostRemoved,
+    
+};
+
+// Enum values for toggleAnimationType
+typedef NS_ENUM(NSInteger, SWRevealToggleAnimationType)
+{
+    SWRevealToggleAnimationTypeSpring,    // <- produces a spring based animation
+    SWRevealToggleAnimationTypeEaseOut,   // <- produces an ease out curve animation
+};
+
+
+@interface SWRevealViewController : UIViewController
+
+/* Basic API */
+
+// Object instance init and rear view setting
+- (id)initWithRearViewController:(UIViewController *)rearViewController frontViewController:(UIViewController *)frontViewController;
+
+// Rear view controller, can be nil if not used
+@property (nonatomic) UIViewController *rearViewController;
+- (void)setRearViewController:(UIViewController *)rearViewController animated:(BOOL)animated;
+
+// Optional right view controller, can be nil if not used
+@property (nonatomic) UIViewController *rightViewController;
+- (void)setRightViewController:(UIViewController *)rightViewController animated:(BOOL)animated;
+
+// Front view controller, can be nil on initialization but must be supplied by the time the view is loaded
+@property (nonatomic) UIViewController *frontViewController;
+- (void)setFrontViewController:(UIViewController *)frontViewController animated:(BOOL)animated;
+
+// Sets the frontViewController using a default set of chained animations consisting on moving the
+// presented frontViewController to the right most possition, replacing it, and moving it back to the left position
+- (void)pushFrontViewController:(UIViewController *)frontViewController animated:(BOOL)animated;
+
+// Sets the frontViewController position. You can call the animated version several times with different
+// positions to obtain a set of animations that will be performed in order one after the other.
+@property (nonatomic) FrontViewPosition frontViewPosition;
+- (void)setFrontViewPosition:(FrontViewPosition)frontViewPosition animated:(BOOL)animated;
+
+// The following methods are meant to be directly connected to the action method of a button
+// to perform user triggered postion change of the controller views. This is ussually added to a
+// button on top left or right of the frontViewController
+- (IBAction)revealToggle:(id)sender;
+- (IBAction)rightRevealToggle:(id)sender; // <-- simetric implementation of the above for the rightViewController
+
+// Toogles the current state of the front controller between Left or Right and fully visible
+// Use setFrontViewPosition to set a particular position
+- (void)revealToggleAnimated:(BOOL)animated;
+- (void)rightRevealToggleAnimated:(BOOL)animated; // <-- simetric implementation of the above for the rightViewController
+
+// The following method will provide a panGestureRecognizer suitable to be added to any view
+// in order to perform usual drag and swipe gestures to reveal the rear views. This is usually added to the top bar
+// of a front controller, but it can be added to your frontViewController view or to the reveal controller view to provide full screen panning.
+// By default, the panGestureRecognizer is added to the view containing the front controller view. To keep this default behavior
+// you still need to call this method, just don't add it to any of your views. The default setup allows you to dissable
+// user interactions on your controller views without affecting the recognizer.
+- (UIPanGestureRecognizer*)panGestureRecognizer;
+
+// The following method will provide a tapGestureRecognizer suitable to be added to any view on the frontController
+// for concealing the rear views. By default no tap recognizer is created or added to any view, however if you call this method after
+// the controller's view has been loaded the recognizer is added to the reveal controller's front container view.
+// Thus, you can disable user interactions on your frontViewController view without affecting the tap recognizer.
+- (UITapGestureRecognizer*)tapGestureRecognizer;
+
+/* The following properties are provided for further customization, they are set to default values on initialization,
+   you do not generally have to set them */
+
+// Defines how much of the rear or right view is shown, default is 260.
+// Negative values indicate that the reveal width should be computed by substracting the full front view width,
+// so the revealed frontView width is kept constant when bounds change as opposed to the rear or right width.
+@property (nonatomic) CGFloat rearViewRevealWidth;
+@property (nonatomic) CGFloat rightViewRevealWidth; // <-- simetric implementation of the above for the rightViewController
+
+// Defines how much of an overdraw can occur when dragging further than 'rearViewRevealWidth', default is 60.
+@property (nonatomic) CGFloat rearViewRevealOverdraw;
+@property (nonatomic) CGFloat rightViewRevealOverdraw;   // <-- simetric implementation of the above for the rightViewController
+
+// Defines how much displacement is applied to the rear view when animating or dragging the front view, default is 40.
+@property (nonatomic) CGFloat rearViewRevealDisplacement;
+@property (nonatomic) CGFloat rightViewRevealDisplacement;  // <-- simetric implementation of the above for the rightViewController
+
+// Defines a width on the border of the view attached to the panGesturRecognizer where the gesture is allowed,
+// default is 0 which means no restriction.
+@property (nonatomic) CGFloat draggableBorderWidth;
+
+// If YES (the default) the controller will bounce to the Left position when dragging further than 'rearViewRevealWidth'
+@property (nonatomic) BOOL bounceBackOnOverdraw;
+@property (nonatomic) BOOL bounceBackOnLeftOverdraw;  // <-- simetric implementation of the above for the rightViewController
+
+// If YES (default is NO) the controller will allow permanent dragging up to the rightMostPosition
+@property (nonatomic) BOOL stableDragOnOverdraw;
+@property (nonatomic) BOOL stableDragOnLeftOverdraw; // <-- simetric implementation of the above for the rightViewController
+
+// If YES (default is NO) the front view controller will be ofsseted vertically by the height of a navigation bar.
+// Use this on iOS7 when you add an instance of RevealViewController as a child of a UINavigationController (or another SWRevealViewController)
+// and you want the front view controller to be presented below the navigation bar of its UINavigationController grand parent.
+// The rearViewController will still appear full size and blurred behind the navigation bar of its UINavigationController grand parent
+@property (nonatomic) BOOL presentFrontViewHierarchically;
+
+// Velocity required for the controller to toggle its state based on a swipe movement, default is 250
+@property (nonatomic) CGFloat quickFlickVelocity;
+
+// Duration for the revealToggle animation, default is 0.25
+@property (nonatomic) NSTimeInterval toggleAnimationDuration;
+
+// Animation type, default is SWRevealToggleAnimationTypeSpring
+@property (nonatomic) SWRevealToggleAnimationType toggleAnimationType;
+
+// When animation type is SWRevealToggleAnimationTypeSpring determines the damping ratio, default is 1
+@property (nonatomic) CGFloat springDampingRatio;
+
+// Duration for animated replacement of view controllers
+@property (nonatomic) NSTimeInterval replaceViewAnimationDuration;
+
+// Defines the radius of the front view's shadow, default is 2.5f
+@property (nonatomic) CGFloat frontViewShadowRadius;
+
+// Defines the radius of the front view's shadow offset default is {0.0f,2.5f}
+@property (nonatomic) CGSize frontViewShadowOffset;
+
+// Defines the front view's shadow opacity, default is 1.0f
+@property (nonatomic) CGFloat frontViewShadowOpacity;
+
+// Defines the front view's shadow color, default is blackColor
+@property (nonatomic) UIColor *frontViewShadowColor;
+
+// Defines whether the controller should clip subviews to its view bounds. Default is NO.
+// Set this to YES when you are presenting this controller as a non full-screen child of a
+// custom container controller which does not explicitly clips its subviews.
+@property (nonatomic) BOOL clipsViewsToBounds;
+
+// Defines whether your views clicable area extends beyond the bounds of this controller. Default is NO.
+// Set this to YES if you are presenting this controller as a non full-screen child of a custom container and you are not
+// clipping your front view to this controller bounds.
+@property (nonatomic) BOOL extendsPointInsideHit;
+
+/* The class properly handles all the relevant calls to appearance methods on the contained controllers.
+   Moreover you can assign a delegate to let the class inform you on positions and animation activity */
+
+// Delegate
+@property (nonatomic,weak) id<SWRevealViewControllerDelegate> delegate;
+
+@end
+
+
+#pragma mark - SWRevealViewControllerDelegate Protocol
+
+typedef enum
+{
+    SWRevealControllerOperationNone,
+    SWRevealControllerOperationReplaceRearController,
+    SWRevealControllerOperationReplaceFrontController,
+    SWRevealControllerOperationReplaceRightController,
+    
+} SWRevealControllerOperation;
+
+
+@protocol SWRevealViewControllerDelegate<NSObject>
+
+@optional
+
+// The following delegate methods will be called before and after the front view moves to a position
+- (void)revealController:(SWRevealViewController *)revealController willMoveToPosition:(FrontViewPosition)position;
+- (void)revealController:(SWRevealViewController *)revealController didMoveToPosition:(FrontViewPosition)position;
+
+// This will be called inside the reveal animation, thus you can use it to place your own code that will be animated in sync
+- (void)revealController:(SWRevealViewController *)revealController animateToPosition:(FrontViewPosition)position;
+
+// Implement this to return NO when you want the pan gesture recognizer to be ignored
+- (BOOL)revealControllerPanGestureShouldBegin:(SWRevealViewController *)revealController;
+
+// Implement this to return NO when you want the tap gesture recognizer to be ignored
+- (BOOL)revealControllerTapGestureShouldBegin:(SWRevealViewController *)revealController;
+
+// Implement this to return YES if you want other gesture recognizer to share touch events with the pan gesture
+- (BOOL)revealController:(SWRevealViewController *)revealController
+    panGestureRecognizerShouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer;
+
+// Implement this to return YES if you want other gesture recognizer to share touch events with the tap gesture
+- (BOOL)revealController:(SWRevealViewController *)revealController
+    tapGestureRecognizerShouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer;
+
+// Called when the gestureRecognizer began and ended
+- (void)revealControllerPanGestureBegan:(SWRevealViewController *)revealController;
+- (void)revealControllerPanGestureEnded:(SWRevealViewController *)revealController;
+
+// The following methods provide a means to track the evolution of the gesture recognizer.
+// The 'location' parameter is the X origin coordinate of the front view as the user drags it
+// The 'progress' parameter is a number ranging from 0 to 1 indicating the front view location relative to the
+//   rearRevealWidth or rightRevealWidth. 1 is fully revealed, dragging ocurring in the overDraw region will result in values above 1.
+// The 'overProgress' parameter is a number ranging from 0 to 1 indicating the front view location relative to the
+//   overdraw region. 0 is fully revealed, 1 is fully overdrawn. Negative values occur inside the normal reveal region
+- (void)revealController:(SWRevealViewController *)revealController panGestureBeganFromLocation:(CGFloat)location progress:(CGFloat)progress overProgress:(CGFloat)overProgress;
+- (void)revealController:(SWRevealViewController *)revealController panGestureMovedToLocation:(CGFloat)location progress:(CGFloat)progress overProgress:(CGFloat)overProgress;
+- (void)revealController:(SWRevealViewController *)revealController panGestureEndedToLocation:(CGFloat)location progress:(CGFloat)progress overProgress:(CGFloat)overProgress;
+
+// Notification of child controller replacement
+- (void)revealController:(SWRevealViewController *)revealController willAddViewController:(UIViewController *)viewController
+    forOperation:(SWRevealControllerOperation)operation animated:(BOOL)animated;
+- (void)revealController:(SWRevealViewController *)revealController didAddViewController:(UIViewController *)viewController
+    forOperation:(SWRevealControllerOperation)operation animated:(BOOL)animated;
+
+// Support for custom transition animations while replacing child controllers. If implemented, it will be fired in response
+// to calls to 'setXXViewController' methods
+- (id<UIViewControllerAnimatedTransitioning>)revealController:(SWRevealViewController *)revealController
+    animationControllerForOperation:(SWRevealControllerOperation)operation fromViewController:(UIViewController *)fromVC toViewController:(UIViewController *)toVC;
+
+// DEPRECATED - The following delegate methods will be removed some time in the future
+- (void)revealController:(SWRevealViewController *)revealController panGestureBeganFromLocation:(CGFloat)location progress:(CGFloat)progress; // (DEPRECATED)
+- (void)revealController:(SWRevealViewController *)revealController panGestureMovedToLocation:(CGFloat)location progress:(CGFloat)progress; // (DEPRECATED)
+- (void)revealController:(SWRevealViewController *)revealController panGestureEndedToLocation:(CGFloat)location progress:(CGFloat)progress; // (DEPRECATED)
+@end
+
+
+#pragma mark - UIViewController(SWRevealViewController) Category
+
+// A category of UIViewController to let childViewControllers easily access their parent SWRevealViewController
+@interface UIViewController(SWRevealViewController)
+
+- (SWRevealViewController*)revealViewController;
+
+@end
+
+
+#pragma mark - StoryBoard support Classes
+
+/* StoryBoard support */
+
+// String identifiers to be applied to segues on a storyboard
+extern NSString* const SWSegueRearIdentifier;  // this is @"sw_rear"
+extern NSString* const SWSegueFrontIdentifier; // this is @"sw_front"
+extern NSString* const SWSegueRightIdentifier; // this is @"sw_right"
+
+/* This will allow the class to be defined on a storyboard */
+
+// Use this along with one of the above segue identifiers to segue to the initial state
+@interface SWRevealViewControllerSegueSetController : UIStoryboardSegue
+@end
+
+// Use this to push a view controller
+@interface SWRevealViewControllerSeguePushController : UIStoryboardSegue
+@end
+
+
+//#pragma mark - SWRevealViewControllerSegue (DEPRECATED)
+//
+//@interface SWRevealViewControllerSegue : UIStoryboardSegue     // DEPRECATED: USE SWRevealViewControllerSegueSetController instead
+//@property (nonatomic, strong) void(^performBlock)( SWRevealViewControllerSegue* segue, UIViewController* svc, UIViewController* dvc );
+//@end

Limelight/ViewControllers/SWRevealViewController.m

@@ -0,0 +1,1897 @@
+/*
+
+ Copyright (c) 2013 Joan Lluch <[email protected]>
+ 
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is furnished
+ to do so, subject to the following conditions:
+ 
+ The above copyright notice and this permission notice shall be included in all
+ copies or substantial portions of the Software.
+ 
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.
+
+ Early code inspired on a similar class by Philip Kluz ([email protected])
+ 
+*/
+
+#import <QuartzCore/QuartzCore.h>
+
+#import "SWRevealViewController.h"
+
+
+#pragma mark - StatusBar Helper Function
+
+// computes the required offset adjustment due to the status bar for the passed in view,
+// it will return the statusBar height if view fully overlaps the statusBar, otherwise returns 0.0f
+static CGFloat statusBarAdjustment( UIView* view )
+{
+    CGFloat adjustment = 0.0f;
+    UIApplication *app = [UIApplication sharedApplication];
+    CGRect viewFrame = [view convertRect:view.bounds toView:[app keyWindow]];
+    CGRect statusBarFrame = [app statusBarFrame];
+    
+    if ( CGRectIntersectsRect(viewFrame, statusBarFrame) )
+        adjustment = fminf(statusBarFrame.size.width, statusBarFrame.size.height);
+
+    return adjustment;
+}
+
+
+#pragma mark - SWRevealView Class
+
+@interface SWRevealView: UIView
+{
+    __weak SWRevealViewController *_c;
+}
+
+@property (nonatomic, readonly) UIView *rearView;
+@property (nonatomic, readonly) UIView *rightView;
+@property (nonatomic, readonly) UIView *frontView;
+@property (nonatomic, assign) BOOL disableLayout;
+
+@end
+
+
+@interface SWRevealViewController()
+- (void)_getRevealWidth:(CGFloat*)pRevealWidth revealOverDraw:(CGFloat*)pRevealOverdraw forSymetry:(int)symetry;
+- (void)_getBounceBack:(BOOL*)pBounceBack pStableDrag:(BOOL*)pStableDrag forSymetry:(int)symetry;
+- (void)_getAdjustedFrontViewPosition:(FrontViewPosition*)frontViewPosition forSymetry:(int)symetry;
+@end
+
+
+@implementation SWRevealView
+
+
+static CGFloat scaledValue( CGFloat v1, CGFloat min2, CGFloat max2, CGFloat min1, CGFloat max1)
+{
+    CGFloat result = min2 + (v1-min1)*((max2-min2)/(max1-min1));
+    if ( result != result ) return min2;  // nan
+    if ( result < min2 ) return min2;
+    if ( result > max2 ) return max2;
+    return result;
+}
+
+
+- (id)initWithFrame:(CGRect)frame controller:(SWRevealViewController*)controller
+{
+    self = [super initWithFrame:frame];
+    if ( self )
+    {
+        _c = controller;
+        CGRect bounds = self.bounds;
+    
+        _frontView = [[UIView alloc] initWithFrame:bounds];
+        _frontView.autoresizingMask = UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight;
+        [self reloadShadow];
+
+        [self addSubview:_frontView];
+    }
+    return self;
+}
+
+
+- (void)reloadShadow
+{
+    CALayer *frontViewLayer = _frontView.layer;
+    frontViewLayer.shadowColor = [_c.frontViewShadowColor CGColor];
+    frontViewLayer.shadowOpacity = _c.frontViewShadowOpacity;
+    frontViewLayer.shadowOffset = _c.frontViewShadowOffset;
+    frontViewLayer.shadowRadius = _c.frontViewShadowRadius;
+}
+
+
+- (CGRect)hierarchycalFrameAdjustment:(CGRect)frame
+{
+    if ( _c.presentFrontViewHierarchically )
+    {
+        UINavigationBar *dummyBar = [[UINavigationBar alloc] init];
+        CGFloat barHeight = [dummyBar sizeThatFits:CGSizeMake(100,100)].height;
+        CGFloat offset = barHeight + statusBarAdjustment(self);
+        frame.origin.y += offset;
+        frame.size.height -= offset;
+    }
+    return frame;
+}
+
+
+- (void)prepareRearViewForPosition:(FrontViewPosition)newPosition
+{
+    if ( _rearView == nil )
+    {
+        _rearView = [[UIView alloc] initWithFrame:self.bounds];
+        _rearView.autoresizingMask = /*UIViewAutoresizingFlexibleWidth|*/UIViewAutoresizingFlexibleHeight;
+        [self insertSubview:_rearView belowSubview:_frontView];
+    }
+    
+    CGFloat xLocation = [self frontLocationForPosition:_c.frontViewPosition];
+    [self _layoutRearViewsForLocation:xLocation];
+    [self _prepareForNewPosition:newPosition];
+}
+
+
+- (void)prepareRightViewForPosition:(FrontViewPosition)newPosition
+{
+    if ( _rightView == nil )
+    {
+        _rightView = [[UIView alloc] initWithFrame:self.bounds];
+        _rightView.autoresizingMask = /*UIViewAutoresizingFlexibleWidth|*/UIViewAutoresizingFlexibleHeight;
+        [self insertSubview:_rightView belowSubview:_frontView];
+    }
+    
+    CGFloat xLocation = [self frontLocationForPosition:_c.frontViewPosition];
+    [self _layoutRearViewsForLocation:xLocation];
+    [self _prepareForNewPosition:newPosition];
+}
+
+
+- (CGFloat)frontLocationForPosition:(FrontViewPosition)frontViewPosition
+{
+    CGFloat revealWidth;
+    CGFloat revealOverdraw;
+    
+    CGFloat location = 0.0f;
+    
+    int symetry = frontViewPosition<FrontViewPositionLeft? -1 : 1;
+    [_c _getRevealWidth:&revealWidth revealOverDraw:&revealOverdraw forSymetry:symetry];
+    [_c _getAdjustedFrontViewPosition:&frontViewPosition forSymetry:symetry];
+    
+    if ( frontViewPosition == FrontViewPositionRight )
+        location = revealWidth;
+    
+    else if ( frontViewPosition > FrontViewPositionRight )
+        location = revealWidth + revealOverdraw;
+
+    return location*symetry;
+}
+
+
+- (void)dragFrontViewToXLocation:(CGFloat)xLocation
+{
+    CGRect bounds = self.bounds;
+    
+    xLocation = [self _adjustedDragLocationForLocation:xLocation];
+    [self _layoutRearViewsForLocation:xLocation];
+    
+    CGRect frame = CGRectMake(xLocation, 0.0f, bounds.size.width, bounds.size.height);
+    _frontView.frame = [self hierarchycalFrameAdjustment:frame];
+}
+
+
+# pragma mark - overrides
+
+- (void)layoutSubviews
+{
+    if ( _disableLayout ) return;
+
+    CGRect bounds = self.bounds;
+    
+    FrontViewPosition position = _c.frontViewPosition;
+    CGFloat xLocation = [self frontLocationForPosition:position];
+    
+    // set rear view frames
+    [self _layoutRearViewsForLocation:xLocation];
+    
+    // set front view frame
+    CGRect frame = CGRectMake(xLocation, 0.0f, bounds.size.width, bounds.size.height);
+    _frontView.frame = [self hierarchycalFrameAdjustment:frame];
+    
+    // setup front view shadow path if needed (front view loaded and not removed)
+    UIViewController *frontViewController = _c.frontViewController;
+    BOOL viewLoaded = frontViewController != nil && frontViewController.isViewLoaded;
+    BOOL viewNotRemoved = position > FrontViewPositionLeftSideMostRemoved && position < FrontViewPositionRightMostRemoved;
+    CGRect shadowBounds = viewLoaded && viewNotRemoved  ? _frontView.bounds : CGRectZero;
+    
+    UIBezierPath *shadowPath = [UIBezierPath bezierPathWithRect:shadowBounds];
+    _frontView.layer.shadowPath = shadowPath.CGPath;
+}
+
+
+- (BOOL)pointInsideD:(CGPoint)point withEvent:(UIEvent *)event
+{
+    BOOL isInside = [super pointInside:point withEvent:event];
+    if ( _c.extendsPointInsideHit )
+    {
+        if ( !isInside  && _rearView && [_c.rearViewController isViewLoaded] )
+        {
+            CGPoint pt = [self convertPoint:point toView:_rearView];
+            isInside = [_rearView pointInside:pt withEvent:event];
+        }
+        
+        if ( !isInside && _frontView && [_c.frontViewController isViewLoaded] )
+        {
+            CGPoint pt = [self convertPoint:point toView:_frontView];
+            isInside = [_frontView pointInside:pt withEvent:event];
+        }
+        
+        if ( !isInside && _rightView && [_c.rightViewController isViewLoaded] )
+        {
+            CGPoint pt = [self convertPoint:point toView:_rightView];
+            isInside = [_rightView pointInside:pt withEvent:event];
+        }
+    }
+    return isInside;
+}
+
+
+- (BOOL)pointInside:(CGPoint)point withEvent:(UIEvent *)event
+{
+    BOOL isInside = [super pointInside:point withEvent:event];
+    if ( !isInside && _c.extendsPointInsideHit )
+    {
+        UIView *testViews[] = { _rearView, _frontView, _rightView };
+        UIViewController *testControllers[] = { _c.rearViewController, _c.frontViewController, _c.rightViewController };
+        
+        for ( NSInteger i=0 ; i<3 && !isInside ; i++ )
+        {
+            if ( testViews[i] && [testControllers[i] isViewLoaded] )
+            {
+                CGPoint pt = [self convertPoint:point toView:testViews[i]];
+                isInside = [testViews[i] pointInside:pt withEvent:event];
+            }
+        }
+    }
+    return isInside;
+}
+
+
+# pragma mark - private
+
+
+- (void)_layoutRearViewsForLocation:(CGFloat)xLocation
+{
+    CGRect bounds = self.bounds;
+    
+    CGFloat rearRevealWidth = _c.rearViewRevealWidth;
+    if ( rearRevealWidth < 0) rearRevealWidth = bounds.size.width + _c.rearViewRevealWidth;
+    
+    CGFloat rearXLocation = scaledValue(xLocation, -_c.rearViewRevealDisplacement, 0, 0, rearRevealWidth);
+    
+    CGFloat rearWidth = rearRevealWidth + _c.rearViewRevealOverdraw;
+    _rearView.frame = CGRectMake(rearXLocation, 0.0, rearWidth, bounds.size.height);
+    
+    CGFloat rightRevealWidth = _c.rightViewRevealWidth;
+    if ( rightRevealWidth < 0) rightRevealWidth = bounds.size.width + _c.rightViewRevealWidth;
+    
+    CGFloat rightXLocation = scaledValue(xLocation, 0, _c.rightViewRevealDisplacement, -rightRevealWidth, 0);
+    
+    CGFloat rightWidth = rightRevealWidth + _c.rightViewRevealOverdraw;
+    _rightView.frame = CGRectMake(bounds.size.width-rightWidth+rightXLocation, 0.0f, rightWidth, bounds.size.height);
+}
+
+
+- (void)_prepareForNewPosition:(FrontViewPosition)newPosition;
+{
+    if ( _rearView == nil || _rightView == nil )
+        return;
+    
+    int symetry = newPosition<FrontViewPositionLeft? -1 : 1;
+
+    NSArray *subViews = self.subviews;
+    NSInteger rearIndex = [subViews indexOfObjectIdenticalTo:_rearView];
+    NSInteger rightIndex = [subViews indexOfObjectIdenticalTo:_rightView];
+    
+    if ( (symetry < 0 && rightIndex < rearIndex) || (symetry > 0 && rearIndex < rightIndex) )
+        [self exchangeSubviewAtIndex:rightIndex withSubviewAtIndex:rearIndex];
+}
+
+
+- (CGFloat)_adjustedDragLocationForLocation:(CGFloat)x
+{
+    CGFloat result;
+    
+    CGFloat revealWidth;
+    CGFloat revealOverdraw;
+    BOOL bounceBack;
+    BOOL stableDrag;
+    FrontViewPosition position = _c.frontViewPosition;
+    
+    int symetry = x<0 ? -1 : 1;
+    
+    [_c _getRevealWidth:&revealWidth revealOverDraw:&revealOverdraw forSymetry:symetry];
+    [_c _getBounceBack:&bounceBack pStableDrag:&stableDrag forSymetry:symetry];
+    
+    BOOL stableTrack = !bounceBack || stableDrag || position==FrontViewPositionRightMost || position==FrontViewPositionLeftSideMost;
+    if ( stableTrack )
+    {
+        revealWidth += revealOverdraw;
+        revealOverdraw = 0.0f;
+    }
+    
+    x = x * symetry;
+    
+    if (x <= revealWidth)
+        result = x;         // Translate linearly.
+
+    else if (x <= revealWidth+2*revealOverdraw)
+        result = revealWidth + (x-revealWidth)/2;   // slow down translation by halph the movement.
+
+    else
+        result = revealWidth+revealOverdraw;        // keep at the rightMost location.
+    
+    return result * symetry;
+}
+
+@end
+
+
+#pragma mark - SWContextTransitioningObject
+
+@interface SWContextTransitionObject : NSObject<UIViewControllerContextTransitioning>
+@end
+
+
+@implementation SWContextTransitionObject
+{
+    __weak SWRevealViewController *_revealVC;
+    UIView *_view;
+    UIViewController *_toVC;
+    UIViewController *_fromVC;
+    void (^_completion)(void);
+}
+
+- (id)initWithRevealController:(SWRevealViewController*)revealVC containerView:(UIView*)view fromVC:(UIViewController*)fromVC
+    toVC:(UIViewController*)toVC completion:(void (^)(void))completion
+{
+    self = [super init];
+    if ( self )
+    {
+        _revealVC = revealVC;
+        _view = view;
+        _fromVC = fromVC;
+        _toVC = toVC;
+        _completion = completion;
+    }
+    return self;
+}
+
+
+- (UIView *)containerView
+{
+    return _view;
+}
+
+
+- (BOOL)isAnimated
+{
+    return YES;
+}
+
+
+- (BOOL)isInteractive
+{
+    return NO;  // not supported
+}
+
+- (BOOL)transitionWasCancelled
+{
+    return NO; // not supported
+}
+
+- (CGAffineTransform)targetTransform {
+    return CGAffineTransformIdentity;
+}
+
+- (UIModalPresentationStyle)presentationStyle
+{
+    return UIModalPresentationNone;  // not applicable
+}
+
+
+- (void)updateInteractiveTransition:(CGFloat)percentComplete
+{
+    // not supported
+}
+
+
+- (void)finishInteractiveTransition
+{
+    // not supported
+}
+
+
+- (void)cancelInteractiveTransition
+{
+    // not supported
+}
+
+
+- (void)completeTransition:(BOOL)didComplete
+{
+    _completion();
+}
+
+
+- (UIViewController *)viewControllerForKey:(NSString *)key
+{
+    if ( [key isEqualToString:UITransitionContextFromViewControllerKey] )
+        return _fromVC;
+    
+    if ( [key isEqualToString:UITransitionContextToViewControllerKey] )
+        return _toVC;
+    
+    return nil;
+}
+
+
+- (UIView *)viewForKey:(NSString *)key
+{
+    return nil;
+}
+
+
+- (CGRect)initialFrameForViewController:(UIViewController *)vc
+{
+    return _view.bounds;
+}
+
+
+- (CGRect)finalFrameForViewController:(UIViewController *)vc
+{
+    return _view.bounds;
+}
+
+@end
+
+
+#pragma mark - SWDefaultAnimationController Class
+
+@interface SWDefaultAnimationController : NSObject<UIViewControllerAnimatedTransitioning>
+@end
+
+@implementation SWDefaultAnimationController
+{
+    NSTimeInterval _duration;
+}
+
+
+- (id)initWithDuration:(NSTimeInterval)duration
+{
+    self = [super init];
+    if ( self )
+    {
+        _duration = duration;
+    }
+    return self;
+}
+
+
+- (NSTimeInterval)transitionDuration:(id<UIViewControllerContextTransitioning>)transitionContext
+{
+    return _duration;
+}
+
+
+- (void)animateTransition:(id <UIViewControllerContextTransitioning>)transitionContext
+{
+    UIViewController *fromViewController = [transitionContext viewControllerForKey:UITransitionContextFromViewControllerKey];
+    UIViewController *toViewController = [transitionContext viewControllerForKey:UITransitionContextToViewControllerKey];
+
+    if ( fromViewController )
+    {
+        [UIView transitionFromView:fromViewController.view toView:toViewController.view duration:_duration
+            options:UIViewAnimationOptionTransitionCrossDissolve|UIViewAnimationOptionOverrideInheritedOptions
+            completion:^(BOOL finished) { [transitionContext completeTransition:finished]; }];
+    }
+    else
+    {
+        // tansitionFromView does not correctly handle the case where the fromView is nil (at least on iOS7) it just pops up the toView view with no animation,
+        // so in such case we replace the crossDissolve animation by a simple alpha animation on the appearing view
+        UIView *toView = toViewController.view;
+        CGFloat alpha = toView.alpha;
+        toView.alpha = 0;
+        
+        [UIView animateWithDuration:_duration delay:0 options:UIViewAnimationOptionCurveEaseOut
+        animations:^{ toView.alpha = alpha;}
+        completion:^(BOOL finished) { [transitionContext completeTransition:finished];}];
+    }
+}
+
+@end
+
+
+#pragma mark - SWRevealViewControllerPanGestureRecognizer
+
+#import <UIKit/UIGestureRecognizerSubclass.h>
+
+@interface SWRevealViewControllerPanGestureRecognizer : UIPanGestureRecognizer
+@end
+
+@implementation SWRevealViewControllerPanGestureRecognizer
+{
+    BOOL _dragging;
+    CGPoint _beginPoint;
+}
+
+- (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    [super touchesBegan:touches withEvent:event];
+   
+    UITouch *touch = [touches anyObject];
+    _beginPoint = [touch locationInView:self.view];
+    _dragging = NO;
+}
+
+
+- (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event
+{
+    [super touchesMoved:touches withEvent:event];
+    
+    if ( _dragging || self.state == UIGestureRecognizerStateFailed)
+        return;
+    
+    const int kDirectionPanThreshold = 5;
+    
+    UITouch *touch = [touches anyObject];
+    CGPoint nowPoint = [touch locationInView:self.view];
+    
+    if (abs(nowPoint.x - _beginPoint.x) > kDirectionPanThreshold) _dragging = YES;
+    else if (abs(nowPoint.y - _beginPoint.y) > kDirectionPanThreshold) self.state = UIGestureRecognizerStateFailed;
+}
+
+@end
+
+
+#pragma mark - SWRevealViewController Class
+
+@interface SWRevealViewController()<UIGestureRecognizerDelegate>
+{
+    SWRevealView *_contentView;
+    UIPanGestureRecognizer *_panGestureRecognizer;
+    UITapGestureRecognizer *_tapGestureRecognizer;
+    FrontViewPosition _frontViewPosition;
+    FrontViewPosition _rearViewPosition;
+    FrontViewPosition _rightViewPosition;
+    SWContextTransitionObject *_rearTransitioningController;
+    SWContextTransitionObject *_frontTransitioningController;
+    SWContextTransitionObject *_rightTransitioningController;
+}
+@end
+
+
+@implementation SWRevealViewController
+{
+    FrontViewPosition _panInitialFrontPosition;
+    NSMutableArray *_animationQueue;
+    BOOL _userInteractionStore;
+}
+
+const int FrontViewPositionNone = 0xff;
+
+
+#pragma mark - Init
+
+- (id)initWithCoder:(NSCoder *)aDecoder
+{
+    self = [super initWithCoder:aDecoder];
+    if ( self )
+    {
+        [self _initDefaultProperties];
+    }    
+    return self;
+}
+
+
+- (id)init
+{
+    return [self initWithRearViewController:nil frontViewController:nil];
+}
+
+
+- (id)initWithRearViewController:(UIViewController *)rearViewController frontViewController:(UIViewController *)frontViewController;
+{
+    self = [super init];
+    if ( self )
+    {
+        [self _initDefaultProperties];
+        [self _performTransitionOperation:SWRevealControllerOperationReplaceRearController withViewController:rearViewController animated:NO];
+        [self _performTransitionOperation:SWRevealControllerOperationReplaceFrontController withViewController:frontViewController animated:NO];
+    }
+    return self;
+}
+
+
+- (void)_initDefaultProperties
+{
+    _frontViewPosition = FrontViewPositionLeft;
+    _rearViewPosition = FrontViewPositionLeft;
+    _rightViewPosition = FrontViewPositionLeft;
+    _rearViewRevealWidth = 260.0f;
+    _rearViewRevealOverdraw = 60.0f;
+    _rearViewRevealDisplacement = 40.0f;
+    _rightViewRevealWidth = 260.0f;
+    _rightViewRevealOverdraw = 60.0f;
+    _rightViewRevealDisplacement = 40.0f;
+    _bounceBackOnOverdraw = YES;
+    _bounceBackOnLeftOverdraw = YES;
+    _stableDragOnOverdraw = NO;
+    _stableDragOnLeftOverdraw = NO;
+    _presentFrontViewHierarchically = NO;
+    _quickFlickVelocity = 250.0f;
+    _toggleAnimationDuration = 0.3;
+    _toggleAnimationType = SWRevealToggleAnimationTypeSpring;
+    _springDampingRatio = 1;
+    _replaceViewAnimationDuration = 0.25;
+    _frontViewShadowRadius = 2.5f;
+    _frontViewShadowOffset = CGSizeMake(0.0f, 2.5f);
+    _frontViewShadowOpacity = 1.0f;
+    _frontViewShadowColor = [UIColor blackColor];
+    _userInteractionStore = YES;
+    _animationQueue = [NSMutableArray array];
+    _draggableBorderWidth = 0.0f;
+    _clipsViewsToBounds = NO;
+    _extendsPointInsideHit = NO;
+}
+
+
+#pragma mark - StatusBar
+
+- (UIViewController *)childViewControllerForStatusBarStyle
+{
+    int positionDif =  _frontViewPosition - FrontViewPositionLeft;
+    
+    UIViewController *controller = _frontViewController;
+    if ( positionDif > 0 ) controller = _rearViewController;
+    else if ( positionDif < 0 ) controller = _rightViewController;
+    
+    return controller;
+}
+
+- (UIViewController *)childViewControllerForStatusBarHidden
+{
+    UIViewController *controller = [self childViewControllerForStatusBarStyle];
+    return controller;
+}
+
+
+#pragma mark - View lifecycle
+
+- (void)loadView
+{
+    // Do not call super, to prevent the apis from unfruitful looking for inexistent xibs!
+    //[super loadView];
+    
+    // load any defined front/rear controllers from the storyboard before
+    [self loadStoryboardControllers];
+    
+    // This is what Apple used to tell us to set as the initial frame, which is of course totally irrelevant
+    // with view controller containment patterns, let's leave it for the sake of it!
+    // CGRect frame = [[UIScreen mainScreen] applicationFrame];
+    
+    // On iOS7 the applicationFrame does not return the whole screen. This is possibly a bug.
+    // As a workaround we use the screen bounds, this still works on iOS6, any zero based frame would work anyway!
+    CGRect frame = [[UIScreen mainScreen] bounds];
+
+    // create a custom content view for the controller
+    _contentView = [[SWRevealView alloc] initWithFrame:frame controller:self];
+    
+    // set the content view to resize along with its superview
+    [_contentView setAutoresizingMask:UIViewAutoresizingFlexibleWidth|UIViewAutoresizingFlexibleHeight];
+    
+    // set the content view to clip its bounds if requested
+    [_contentView setClipsToBounds:_clipsViewsToBounds];
+
+    // set our contentView to the controllers view
+    self.view = _contentView;
+    
+    // Apple also tells us to do this:
+    _contentView.backgroundColor = [UIColor blackColor];
+    
+    // we set the current frontViewPosition to none before seting the
+    // desired initial position, this will force proper controller reload
+    FrontViewPosition initialPosition = _frontViewPosition;
+    _frontViewPosition = FrontViewPositionNone;
+    _rearViewPosition = FrontViewPositionNone;
+    _rightViewPosition = FrontViewPositionNone;
+    
+    // now set the desired initial position
+    [self _setFrontViewPosition:initialPosition withDuration:0.0];
+}
+
+
+- (void)viewDidAppear:(BOOL)animated
+{
+    [super viewDidAppear:animated];
+
+    // Uncomment the following code if you want the child controllers
+    // to be loaded at this point.
+    //
+    // We leave this commented out because we think loading childs here is conceptually wrong.
+    // Instead, we refrain view loads until necesary, for example we may never load
+    // the rear controller view -or the front controller view- if it is never displayed.
+    //
+    // If you need to manipulate views of any of your child controllers in an override
+    // of this method, you can load yourself the views explicitly on your overriden method.
+    // However we discourage it as an app following the MVC principles should never need to do so
+        
+//  [_frontViewController view];
+//  [_rearViewController view];
+
+    // we store at this point the view's user interaction state as we may temporarily disable it
+    // and resume it back to the previous state, it is possible to override this behaviour by
+    // intercepting it on the panGestureBegan and panGestureEnded delegates
+    _userInteractionStore = _contentView.userInteractionEnabled;
+}
+
+
+- (NSUInteger)supportedInterfaceOrientations
+{
+    // we could have simply not implemented this, but we choose to call super to make explicit that we
+    // want the default behavior.
+    return [super supportedInterfaceOrientations];
+}
+
+
+#pragma mark - Public methods and property accessors
+
+- (void)setFrontViewController:(UIViewController *)frontViewController
+{
+    [self setFrontViewController:frontViewController animated:NO];
+}
+
+
+- (void)setFrontViewController:(UIViewController *)frontViewController animated:(BOOL)animated
+{
+    if ( ![self isViewLoaded])
+    {
+        [self _performTransitionOperation:SWRevealControllerOperationReplaceFrontController withViewController:frontViewController animated:NO];
+        return;
+    }
+    
+    [self _dispatchTransitionOperation:SWRevealControllerOperationReplaceFrontController withViewController:frontViewController animated:animated];
+}
+
+
+- (void)pushFrontViewController:(UIViewController *)frontViewController animated:(BOOL)animated
+{
+    if ( ![self isViewLoaded])
+    {
+        [self _performTransitionOperation:SWRevealControllerOperationReplaceFrontController withViewController:frontViewController animated:NO];
+        return;
+    }
+    
+    [self _dispatchPushFrontViewController:frontViewController animated:animated];
+}
+
+
+- (void)setRearViewController:(UIViewController *)rearViewController
+{
+    [self setRearViewController:rearViewController animated:NO];
+}
+
+
+- (void)setRearViewController:(UIViewController *)rearViewController animated:(BOOL)animated
+{
+    if ( ![self isViewLoaded])
+    {
+        [self _performTransitionOperation:SWRevealControllerOperationReplaceRearController withViewController:rearViewController animated:NO];
+        return;
+    }
+
+    [self _dispatchTransitionOperation:SWRevealControllerOperationReplaceRearController withViewController:rearViewController animated:animated];
+}
+
+
+- (void)setRightViewController:(UIViewController *)rightViewController
+{
+    [self setRightViewController:rightViewController animated:NO];
+}
+
+
+- (void)setRightViewController:(UIViewController *)rightViewController animated:(BOOL)animated
+{
+    if ( ![self isViewLoaded])
+    {
+        [self _performTransitionOperation:SWRevealControllerOperationReplaceRightController withViewController:rightViewController animated:NO];
+        return;
+    }
+
+    [self _dispatchTransitionOperation:SWRevealControllerOperationReplaceRightController withViewController:rightViewController animated:animated];
+}
+
+
+- (void)revealToggleAnimated:(BOOL)animated
+{
+    FrontViewPosition toggledFrontViewPosition = FrontViewPositionLeft;
+    if (_frontViewPosition <= FrontViewPositionLeft)
+        toggledFrontViewPosition = FrontViewPositionRight;
+    
+    [self setFrontViewPosition:toggledFrontViewPosition animated:animated];
+}
+
+
+- (void)rightRevealToggleAnimated:(BOOL)animated
+{
+    FrontViewPosition toggledFrontViewPosition = FrontViewPositionLeft;
+    if (_frontViewPosition >= FrontViewPositionLeft)
+        toggledFrontViewPosition = FrontViewPositionLeftSide;
+    
+    [self setFrontViewPosition:toggledFrontViewPosition animated:animated];
+}
+
+
+- (void)setFrontViewPosition:(FrontViewPosition)frontViewPosition
+{
+    [self setFrontViewPosition:frontViewPosition animated:NO];
+}
+
+
+- (void)setFrontViewPosition:(FrontViewPosition)frontViewPosition animated:(BOOL)animated
+{
+    if ( ![self isViewLoaded] )
+    {
+        _frontViewPosition = frontViewPosition;
+        _rearViewPosition = frontViewPosition;
+        _rightViewPosition = frontViewPosition;
+        return;
+    }
+    
+    [self _dispatchSetFrontViewPosition:frontViewPosition animated:animated];
+}
+
+
+- (void)setFrontViewShadowRadius:(CGFloat)frontViewShadowRadius
+{
+    _frontViewShadowRadius = frontViewShadowRadius;
+    [_contentView reloadShadow];
+}
+
+
+- (void)setFrontViewShadowOffset:(CGSize)frontViewShadowOffset
+{
+    _frontViewShadowOffset = frontViewShadowOffset;
+    [_contentView reloadShadow];
+}
+
+
+- (void)setFrontViewShadowOpacity:(CGFloat)frontViewShadowOpacity
+{
+    _frontViewShadowOpacity = frontViewShadowOpacity;
+    [_contentView reloadShadow];
+}
+
+
+- (void)setFrontViewShadowColor:(UIColor *)frontViewShadowColor
+{
+    _frontViewShadowColor = frontViewShadowColor;
+    [_contentView reloadShadow];
+}
+
+
+- (UIPanGestureRecognizer*)panGestureRecognizer
+{
+    if ( _panGestureRecognizer == nil )
+    {
+        _panGestureRecognizer = [[SWRevealViewControllerPanGestureRecognizer alloc] initWithTarget:self action:@selector(_handleRevealGesture:)];
+        _panGestureRecognizer.delegate = self;
+        [_contentView.frontView addGestureRecognizer:_panGestureRecognizer];
+    }
+    return _panGestureRecognizer;
+}
+
+
+- (UITapGestureRecognizer*)tapGestureRecognizer
+{
+    if ( _tapGestureRecognizer == nil )
+    {
+        UITapGestureRecognizer *tapRecognizer =
+            [[UITapGestureRecognizer alloc] initWithTarget:self action:@selector(_handleTapGesture:)];
+        
+        tapRecognizer.delegate = self;
+        [_contentView.frontView addGestureRecognizer:tapRecognizer];
+        _tapGestureRecognizer = tapRecognizer ;
+    }
+    return _tapGestureRecognizer;
+}
+
+
+- (void)setClipsViewsToBounds:(BOOL)clipsViewsToBounds
+{
+    _clipsViewsToBounds = clipsViewsToBounds;
+    [_contentView setClipsToBounds:clipsViewsToBounds];
+}
+
+
+
+#pragma mark - Provided acction methods
+
+- (IBAction)revealToggle:(id)sender
+{    
+    [self revealToggleAnimated:YES];
+}
+
+
+- (IBAction)rightRevealToggle:(id)sender
+{    
+    [self rightRevealToggleAnimated:YES];
+}
+
+
+#pragma mark - UserInteractionEnabling
+
+// disable userInteraction on the entire control
+- (void)_disableUserInteraction
+{
+    [_contentView setUserInteractionEnabled:NO];
+    [_contentView setDisableLayout:YES];
+}
+
+// restore userInteraction on the control
+- (void)_restoreUserInteraction
+{
+    // we use the stored userInteraction state just in case a developer decided
+    // to have our view interaction disabled beforehand
+    [_contentView setUserInteractionEnabled:_userInteractionStore];
+    [_contentView setDisableLayout:NO];
+}
+
+
+#pragma mark - PanGesture progress notification
+
+- (void)_notifyPanGestureBegan
+{
+    if ( [_delegate respondsToSelector:@selector(revealControllerPanGestureBegan:)] )
+        [_delegate revealControllerPanGestureBegan:self];
+    
+    CGFloat xLocation, dragProgress, overProgress;
+    [self _getDragLocation:&xLocation progress:&dragProgress overdrawProgress:&overProgress];
+    
+    if ( [_delegate respondsToSelector:@selector(revealController:panGestureBeganFromLocation:progress:overProgress:)] )
+        [_delegate revealController:self panGestureBeganFromLocation:xLocation progress:dragProgress overProgress:overProgress];
+    
+    else if ( [_delegate respondsToSelector:@selector(revealController:panGestureBeganFromLocation:progress:)] )
+        [_delegate revealController:self panGestureBeganFromLocation:xLocation progress:dragProgress];
+}
+
+- (void)_notifyPanGestureMoved
+{
+    CGFloat xLocation, dragProgress, overProgress;
+    [self _getDragLocation:&xLocation progress:&dragProgress overdrawProgress:&overProgress];
+    
+    if ( [_delegate respondsToSelector:@selector(revealController:panGestureMovedToLocation:progress:overProgress:)] )
+        [_delegate revealController:self panGestureMovedToLocation:xLocation progress:dragProgress overProgress:overProgress];
+    
+    else if ( [_delegate respondsToSelector:@selector(revealController:panGestureMovedToLocation:progress:)] )
+        [_delegate revealController:self panGestureMovedToLocation:xLocation progress:dragProgress];
+}
+
+- (void)_notifyPanGestureEnded
+{
+    CGFloat xLocation, dragProgress, overProgress;
+    [self _getDragLocation:&xLocation progress:&dragProgress overdrawProgress:&overProgress];
+    
+    if ( [_delegate respondsToSelector:@selector(revealController:panGestureEndedToLocation:progress:overProgress:)] )
+        [_delegate revealController:self panGestureEndedToLocation:xLocation progress:dragProgress overProgress:overProgress];
+    
+    else if ( [_delegate respondsToSelector:@selector(revealController:panGestureEndedToLocation:progress:)] )
+        [_delegate revealController:self panGestureEndedToLocation:xLocation progress:dragProgress];
+    
+    if ( [_delegate respondsToSelector:@selector(revealControllerPanGestureEnded:)] )
+        [_delegate revealControllerPanGestureEnded:self];
+}
+
+
+#pragma mark - Symetry
+
+- (void)_getRevealWidth:(CGFloat*)pRevealWidth revealOverDraw:(CGFloat*)pRevealOverdraw forSymetry:(int)symetry
+{
+    if ( symetry < 0 ) *pRevealWidth = _rightViewRevealWidth, *pRevealOverdraw = _rightViewRevealOverdraw;
+    else *pRevealWidth = _rearViewRevealWidth, *pRevealOverdraw = _rearViewRevealOverdraw;
+    
+    if (*pRevealWidth < 0) *pRevealWidth = _contentView.bounds.size.width + *pRevealWidth;
+}
+
+- (void)_getBounceBack:(BOOL*)pBounceBack pStableDrag:(BOOL*)pStableDrag forSymetry:(int)symetry
+{
+    if ( symetry < 0 ) *pBounceBack = _bounceBackOnLeftOverdraw, *pStableDrag = _stableDragOnLeftOverdraw;
+    else *pBounceBack = _bounceBackOnOverdraw, *pStableDrag = _stableDragOnOverdraw;
+}
+
+- (void)_getAdjustedFrontViewPosition:(FrontViewPosition*)frontViewPosition forSymetry:(int)symetry
+{
+    if ( symetry < 0 ) *frontViewPosition = FrontViewPositionLeft + symetry*(*frontViewPosition-FrontViewPositionLeft);
+}
+
+- (void)_getDragLocationx:(CGFloat*)xLocation progress:(CGFloat*)progress
+{
+    UIView *frontView = _contentView.frontView;
+    *xLocation = frontView.frame.origin.x;
+
+    int symetry = *xLocation<0 ? -1 : 1;
+    
+    CGFloat xWidth = symetry < 0 ? _rightViewRevealWidth : _rearViewRevealWidth;
+    if ( xWidth < 0 ) xWidth = _contentView.bounds.size.width + xWidth;
+    
+    *progress = *xLocation/xWidth * symetry;
+}
+
+- (void)_getDragLocation:(CGFloat*)xLocation progress:(CGFloat*)progress overdrawProgress:(CGFloat*)overProgress
+{
+    UIView *frontView = _contentView.frontView;
+    *xLocation = frontView.frame.origin.x;
+
+    int symetry = *xLocation<0 ? -1 : 1;
+    
+    CGFloat xWidth = symetry < 0 ? _rightViewRevealWidth : _rearViewRevealWidth;
+    CGFloat xOverWidth = symetry < 0 ? _rightViewRevealOverdraw : _rearViewRevealOverdraw;
+    
+    if ( xWidth < 0 ) xWidth = _contentView.bounds.size.width + xWidth;
+    
+    *progress = *xLocation*symetry/xWidth;
+    *overProgress = (*xLocation*symetry-xWidth)/xOverWidth;
+}
+
+
+#pragma mark - Deferred block execution queue
+
+// Define a convenience macro to enqueue single statements
+#define _enqueue(code) [self _enqueueBlock:^{code;}];
+
+// Defers the execution of the passed in block until a paired _dequeue call is received,
+// or executes the block right away if no pending requests are present.
+- (void)_enqueueBlock:(void (^)(void))block
+{
+    [_animationQueue insertObject:block atIndex:0];
+    if ( _animationQueue.count == 1)
+    {
+        block();
+    }
+}
+
+// Removes the top most block in the queue and executes the following one if any.
+// Calls to this method must be paired with calls to _enqueueBlock, particularly it may be called
+// from within a block passed to _enqueueBlock to remove itself when done with animations.  
+- (void)_dequeue
+{
+    [_animationQueue removeLastObject];
+
+    if ( _animationQueue.count > 0 )
+    {
+        void (^block)(void) = [_animationQueue lastObject];
+        block();
+    }
+}
+
+
+#pragma mark - Gesture Delegate
+
+- (BOOL)gestureRecognizerShouldBegin:(UIGestureRecognizer *)recognizer
+{
+    // only allow gesture if no previous request is in process
+    if ( _animationQueue.count == 0 )
+    {
+        if ( recognizer == _panGestureRecognizer )
+            return [self _panGestureShouldBegin];
+        
+        if ( recognizer == _tapGestureRecognizer )
+            return [self _tapGestureShouldBegin];
+    }
+
+    return NO;
+}
+
+
+- (BOOL)gestureRecognizer:(UIGestureRecognizer *)gestureRecognizer shouldRecognizeSimultaneouslyWithGestureRecognizer:(UIGestureRecognizer *)otherGestureRecognizer
+{
+    if ( gestureRecognizer == _panGestureRecognizer )
+    {
+        if ( [_delegate respondsToSelector:@selector(revealController:panGestureRecognizerShouldRecognizeSimultaneouslyWithGestureRecognizer:)] )
+            if ( [_delegate revealController:self panGestureRecognizerShouldRecognizeSimultaneouslyWithGestureRecognizer:otherGestureRecognizer] != NO )
+                return YES;
+    }
+    if ( gestureRecognizer == _tapGestureRecognizer )
+    {
+        if ( [_delegate respondsToSelector:@selector(revealController:tapGestureRecognizerShouldRecognizeSimultaneouslyWithGestureRecognizer:)] )
+            if ( [_delegate revealController:self tapGestureRecognizerShouldRecognizeSimultaneouslyWithGestureRecognizer:otherGestureRecognizer] != NO )
+                return YES;
+    }
+    
+    return NO;
+}
+
+
+- (BOOL)_tapGestureShouldBegin
+{
+    if ( _frontViewPosition == FrontViewPositionLeft ||
+        _frontViewPosition == FrontViewPositionRightMostRemoved ||
+        _frontViewPosition == FrontViewPositionLeftSideMostRemoved )
+            return NO;
+    
+    // forbid gesture if the following delegate is implemented and returns NO
+    if ( [_delegate respondsToSelector:@selector(revealControllerTapGestureShouldBegin:)] )
+        if ( [_delegate revealControllerTapGestureShouldBegin:self] == NO )
+            return NO;
+    
+    return YES;
+}
+
+
+- (BOOL)_panGestureShouldBegin
+{
+    // forbid gesture if the initial translation is not horizontal
+    UIView *recognizerView = _panGestureRecognizer.view;
+    CGPoint translation = [_panGestureRecognizer translationInView:recognizerView];
+//        Log(LOG_D, @"translation:%@", NSStringFromCGPoint(translation) );
+//    if ( fabs(translation.y/translation.x) > 1 )
+//        return NO;
+
+    // forbid gesture if the following delegate is implemented and returns NO
+    if ( [_delegate respondsToSelector:@selector(revealControllerPanGestureShouldBegin:)] )
+        if ( [_delegate revealControllerPanGestureShouldBegin:self] == NO )
+            return NO;
+
+    CGFloat xLocation = [_panGestureRecognizer locationInView:recognizerView].x;
+    CGFloat width = recognizerView.bounds.size.width;
+    
+    BOOL draggableBorderAllowing = (
+         /*_frontViewPosition != FrontViewPositionLeft ||*/ _draggableBorderWidth == 0.0f ||
+         (_rearViewController && xLocation <= _draggableBorderWidth) ||
+         (_rightViewController && xLocation >= (width - _draggableBorderWidth)) );
+    
+    
+    BOOL translationForbidding = ( _frontViewPosition == FrontViewPositionLeft &&
+        ((_rearViewController == nil && translation.x > 0) || (_rightViewController == nil && translation.x < 0)) );
+
+    // allow gesture only within the bounds defined by the draggableBorderWidth property
+    return draggableBorderAllowing && !translationForbidding ;
+}
+
+
+#pragma mark - Gesture Based Reveal
+
+- (void)_handleTapGesture:(UITapGestureRecognizer *)recognizer
+{
+    NSTimeInterval duration = _toggleAnimationDuration;
+    [self _setFrontViewPosition:FrontViewPositionLeft withDuration:duration];
+}
+
+
+- (void)_handleRevealGesture:(UIPanGestureRecognizer *)recognizer
+{
+    switch ( recognizer.state )
+    {
+        case UIGestureRecognizerStateBegan:
+            [self _handleRevealGestureStateBeganWithRecognizer:recognizer];
+            break;
+            
+        case UIGestureRecognizerStateChanged:
+            [self _handleRevealGestureStateChangedWithRecognizer:recognizer];
+            break;
+            
+        case UIGestureRecognizerStateEnded:
+            [self _handleRevealGestureStateEndedWithRecognizer:recognizer];
+            break;
+            
+        case UIGestureRecognizerStateCancelled:
+        //case UIGestureRecognizerStateFailed:
+            [self _handleRevealGestureStateCancelledWithRecognizer:recognizer];
+            break;
+            
+        default:
+            break;
+    }
+}
+
+
+- (void)_handleRevealGestureStateBeganWithRecognizer:(UIPanGestureRecognizer *)recognizer
+{
+    // we know that we will not get here unless the animationQueue is empty because the recognizer
+    // delegate prevents it, however we do not want any forthcoming programatic actions to disturb
+    // the gesture, so we just enqueue a dummy block to ensure any programatic acctions will be
+    // scheduled after the gesture is completed
+    [self _enqueueBlock:^{}]; // <-- dummy block
+
+    // we store the initial position and initialize a target position
+    _panInitialFrontPosition = _frontViewPosition;
+
+    // we disable user interactions on the views, however programatic accions will still be
+    // enqueued to be performed after the gesture completes
+    [self _disableUserInteraction];
+    [self _notifyPanGestureBegan];
+}
+
+
+- (void)_handleRevealGestureStateChangedWithRecognizer:(UIPanGestureRecognizer *)recognizer
+{
+    CGFloat translation = [recognizer translationInView:_contentView].x;
+    
+    CGFloat baseLocation = [_contentView frontLocationForPosition:_panInitialFrontPosition];
+    CGFloat xLocation = baseLocation + translation;
+    
+    if ( xLocation < 0 )
+    {
+        if ( _rightViewController == nil ) xLocation = 0;
+        [self _rightViewDeploymentForNewFrontViewPosition:FrontViewPositionLeftSide]();
+        [self _rearViewDeploymentForNewFrontViewPosition:FrontViewPositionLeftSide]();
+    }
+    
+    if ( xLocation > 0 )
+    {
+        if ( _rearViewController == nil ) xLocation = 0;
+        [self _rightViewDeploymentForNewFrontViewPosition:FrontViewPositionRight]();
+        [self _rearViewDeploymentForNewFrontViewPosition:FrontViewPositionRight]();
+    }
+    
+    [_contentView dragFrontViewToXLocation:xLocation];
+    [self _notifyPanGestureMoved];
+}
+
+
+- (void)_handleRevealGestureStateEndedWithRecognizer:(UIPanGestureRecognizer *)recognizer
+{
+    UIView *frontView = _contentView.frontView;
+    
+    CGFloat xLocation = frontView.frame.origin.x;
+    CGFloat velocity = [recognizer velocityInView:_contentView].x;
+    //Log(LOG_D, @"Velocity:%1.4f", velocity);
+    
+    // depending on position we compute a simetric replacement of widths and positions
+    int symetry = xLocation<0 ? -1 : 1;
+    
+    // simetring computing of widths
+    CGFloat revealWidth ;
+    CGFloat revealOverdraw ;
+    BOOL bounceBack;
+    BOOL stableDrag;
+    
+    [self _getRevealWidth:&revealWidth revealOverDraw:&revealOverdraw forSymetry:symetry];
+    [self _getBounceBack:&bounceBack pStableDrag:&stableDrag forSymetry:symetry];
+    
+    // simetric replacement of position
+    xLocation = xLocation * symetry;
+    
+    // initially we assume drag to left and default duration
+    FrontViewPosition frontViewPosition = FrontViewPositionLeft;
+    NSTimeInterval duration = _toggleAnimationDuration;
+
+    // Velocity driven change:
+    if (fabsf(velocity) > _quickFlickVelocity)
+    {
+        // we may need to set the drag position and to adjust the animation duration
+        CGFloat journey = xLocation;
+        if (velocity*symetry > 0.0f)
+        {
+            frontViewPosition = FrontViewPositionRight;
+            journey = revealWidth - xLocation;
+            if (xLocation > revealWidth)
+            {
+                if (!bounceBack && stableDrag /*&& xPosition > _rearViewRevealWidth+_rearViewRevealOverdraw*0.5f*/)
+                {
+                    frontViewPosition = FrontViewPositionRightMost;
+                    journey = revealWidth+revealOverdraw - xLocation;
+                }
+            }
+        }
+        
+        duration = fabsf(journey/velocity);
+    }
+    
+    // Position driven change:
+    else
+    {    
+        // we may need to set the drag position        
+        if (xLocation > revealWidth*0.5f)
+        {
+            frontViewPosition = FrontViewPositionRight;
+            if (xLocation > revealWidth)
+            {
+                if (bounceBack)
+                    frontViewPosition = FrontViewPositionLeft;
+
+                else if (stableDrag && xLocation > revealWidth+revealOverdraw*0.5f)
+                    frontViewPosition = FrontViewPositionRightMost;
+            }
+        }
+    }
+    
+    // symetric replacement of frontViewPosition
+    [self _getAdjustedFrontViewPosition:&frontViewPosition forSymetry:symetry];
+    
+    // restore user interaction and animate to the final position
+    [self _restoreUserInteraction];
+    [self _notifyPanGestureEnded];
+    [self _setFrontViewPosition:frontViewPosition withDuration:duration];
+}
+
+
+- (void)_handleRevealGestureStateCancelledWithRecognizer:(UIPanGestureRecognizer *)recognizer
+{    
+    [self _restoreUserInteraction];
+    [self _notifyPanGestureEnded];
+    [self _dequeue];
+}
+
+
+#pragma mark Enqueued position and controller setup
+
+- (void)_dispatchSetFrontViewPosition:(FrontViewPosition)frontViewPosition animated:(BOOL)animated
+{
+    NSTimeInterval duration = animated?_toggleAnimationDuration:0.0;
+    __weak SWRevealViewController *theSelf = self;
+    _enqueue( [theSelf _setFrontViewPosition:frontViewPosition withDuration:duration] );
+}
+
+
+- (void)_dispatchPushFrontViewController:(UIViewController *)newFrontViewController animated:(BOOL)animated
+{
+    FrontViewPosition preReplacementPosition = FrontViewPositionLeft;
+    if ( _frontViewPosition > FrontViewPositionLeft ) preReplacementPosition = FrontViewPositionRightMost;
+    if ( _frontViewPosition < FrontViewPositionLeft ) preReplacementPosition = FrontViewPositionLeftSideMost;
+    
+    NSTimeInterval duration = animated?_toggleAnimationDuration:0.0;
+    NSTimeInterval firstDuration = duration;
+    int initialPosDif = abs( _frontViewPosition - preReplacementPosition );
+    if ( initialPosDif == 1 ) firstDuration *= 0.8;
+    else if ( initialPosDif == 0 ) firstDuration = 0;
+    
+    __weak SWRevealViewController *theSelf = self;
+    if ( animated )
+    {
+        _enqueue( [theSelf _setFrontViewPosition:preReplacementPosition withDuration:firstDuration] );
+        _enqueue( [theSelf _performTransitionOperation:SWRevealControllerOperationReplaceFrontController withViewController:newFrontViewController animated:NO] );
+        _enqueue( [theSelf _setFrontViewPosition:FrontViewPositionLeft withDuration:duration] );
+    }
+    else
+    {
+        _enqueue( [theSelf _performTransitionOperation:SWRevealControllerOperationReplaceFrontController withViewController:newFrontViewController animated:NO] );
+    }
+}
+
+
+- (void)_dispatchTransitionOperation:(SWRevealControllerOperation)operation withViewController:(UIViewController *)newViewController animated:(BOOL)animated
+{
+    __weak SWRevealViewController *theSelf = self;
+    _enqueue( [theSelf _performTransitionOperation:operation withViewController:newViewController animated:animated] );
+}
+
+
+#pragma mark Animated view controller deployment and layout
+
+// Primitive method for view controller deployment and animated layout to the given position.
+- (void)_setFrontViewPosition:(FrontViewPosition)newPosition withDuration:(NSTimeInterval)duration
+{
+    void (^rearDeploymentCompletion)() = [self _rearViewDeploymentForNewFrontViewPosition:newPosition];
+    void (^rightDeploymentCompletion)() = [self _rightViewDeploymentForNewFrontViewPosition:newPosition];
+    void (^frontDeploymentCompletion)() = [self _frontViewDeploymentForNewFrontViewPosition:newPosition];
+    
+    void (^animations)() = ^()
+    {
+        // Calling this in the animation block causes the status bar to appear/dissapear in sync with our own animation
+        [self setNeedsStatusBarAppearanceUpdate];
+        
+        // We call the layoutSubviews method on the contentView view and send a delegate, which will
+        // occur inside of an animation block if any animated transition is being performed
+        [_contentView layoutSubviews];
+    
+        if ([_delegate respondsToSelector:@selector(revealController:animateToPosition:)])
+            [_delegate revealController:self animateToPosition:_frontViewPosition];
+    };
+    
+    void (^completion)(BOOL) = ^(BOOL finished)
+    {
+        rearDeploymentCompletion();
+        rightDeploymentCompletion();
+        frontDeploymentCompletion();
+        [self _dequeue];
+    };
+    
+    if ( duration > 0.0 )
+    {
+        if ( _toggleAnimationType == SWRevealToggleAnimationTypeEaseOut )
+        {
+            [UIView animateWithDuration:duration delay:0.0
+            options:UIViewAnimationOptionCurveEaseOut animations:animations completion:completion];
+        }
+        else
+        {
+            [UIView animateWithDuration:_toggleAnimationDuration delay:0.0 usingSpringWithDamping:_springDampingRatio initialSpringVelocity:1/duration
+            options:0 animations:animations completion:completion];
+        }
+    }
+    else
+    {
+        animations();
+        completion(YES);
+    }
+}
+
+
+// Primitive method for animated controller transition
+//- (void)_performTransitionToViewController:(UIViewController*)new operation:(SWRevealControllerOperation)operation animated:(BOOL)animated
+- (void)_performTransitionOperation:(SWRevealControllerOperation)operation withViewController:(UIViewController*)new animated:(BOOL)animated
+{
+    if ( [_delegate respondsToSelector:@selector(revealController:willAddViewController:forOperation:animated:)] )
+        [_delegate revealController:self willAddViewController:new forOperation:operation animated:animated];
+
+    UIViewController *old = nil;
+    UIView *view = nil;
+    
+    if ( operation == SWRevealControllerOperationReplaceRearController )
+        old = _rearViewController, _rearViewController = new, view = _contentView.rearView;
+    
+    else if ( operation == SWRevealControllerOperationReplaceFrontController )
+        old = _frontViewController, _frontViewController = new, view = _contentView.frontView;
+    
+    else if ( operation == SWRevealControllerOperationReplaceRightController )
+        old = _rightViewController, _rightViewController = new, view = _contentView.rightView;
+
+    void (^completion)() = [self _transitionFromViewController:old toViewController:new inView:view];
+    
+    void (^animationCompletion)() = ^
+    {
+        completion();
+        if ( [_delegate respondsToSelector:@selector(revealController:didAddViewController:forOperation:animated:)] )
+            [_delegate revealController:self didAddViewController:new forOperation:operation animated:animated];
+    
+        [self _dequeue];
+    };
+    
+    if ( animated )
+    {
+        id<UIViewControllerAnimatedTransitioning> animationController = nil;
+    
+        if ( [_delegate respondsToSelector:@selector(revealController:animationControllerForOperation:fromViewController:toViewController:)] )
+            animationController = [_delegate revealController:self animationControllerForOperation:operation fromViewController:old toViewController:new];
+    
+        if ( !animationController )
+            animationController = [[SWDefaultAnimationController alloc] initWithDuration:_replaceViewAnimationDuration];
+    
+        SWContextTransitionObject *transitioningObject = [[SWContextTransitionObject alloc] initWithRevealController:self containerView:view
+            fromVC:old toVC:new completion:animationCompletion];
+    
+        if ( [animationController transitionDuration:transitioningObject] > 0 )
+            [animationController animateTransition:transitioningObject];
+        else
+            animationCompletion();
+    }
+    else
+    {
+        animationCompletion();
+    }
+}
+
+
+#pragma mark Position based view controller deployment
+
+// Deploy/Undeploy of the front view controller following the containment principles. Returns a block
+// that must be invoked on animation completion in order to finish deployment
+- (void (^)(void))_frontViewDeploymentForNewFrontViewPosition:(FrontViewPosition)newPosition
+{
+    if ( (_rightViewController == nil && newPosition < FrontViewPositionLeft) ||
+         (_rearViewController == nil && newPosition > FrontViewPositionLeft) )
+        newPosition = FrontViewPositionLeft;
+    
+    BOOL positionIsChanging = (_frontViewPosition != newPosition);
+    
+    BOOL appear =
+        (_frontViewPosition >= FrontViewPositionRightMostRemoved || _frontViewPosition <= FrontViewPositionLeftSideMostRemoved || _frontViewPosition == FrontViewPositionNone) &&
+        (newPosition < FrontViewPositionRightMostRemoved && newPosition > FrontViewPositionLeftSideMostRemoved);
+    
+    BOOL disappear =
+        (newPosition >= FrontViewPositionRightMostRemoved || newPosition <= FrontViewPositionLeftSideMostRemoved ) &&
+        (_frontViewPosition < FrontViewPositionRightMostRemoved && _frontViewPosition > FrontViewPositionLeftSideMostRemoved && _frontViewPosition != FrontViewPositionNone);
+    
+    if ( positionIsChanging )
+    {
+        if ( [_delegate respondsToSelector:@selector(revealController:willMoveToPosition:)] )
+            [_delegate revealController:self willMoveToPosition:newPosition];
+    }
+    
+    _frontViewPosition = newPosition;
+    
+    void (^deploymentCompletion)() =
+        [self _deploymentForViewController:_frontViewController inView:_contentView.frontView appear:appear disappear:disappear];
+    
+    void (^completion)() = ^()
+    {
+        deploymentCompletion();
+        if ( positionIsChanging )
+        {
+            if ( [_delegate respondsToSelector:@selector(revealController:didMoveToPosition:)] )
+                [_delegate revealController:self didMoveToPosition:newPosition];
+        }
+    };
+
+    return completion;
+}
+
+// Deploy/Undeploy of the left view controller following the containment principles. Returns a block
+// that must be invoked on animation completion in order to finish deployment
+- (void (^)(void))_rearViewDeploymentForNewFrontViewPosition:(FrontViewPosition)newPosition
+{
+    if ( _presentFrontViewHierarchically )
+        newPosition = FrontViewPositionRight;
+    
+    if ( _rearViewController == nil && newPosition > FrontViewPositionLeft )
+        newPosition = FrontViewPositionLeft;
+
+    BOOL appear = (_rearViewPosition <= FrontViewPositionLeft || _rearViewPosition == FrontViewPositionNone) && newPosition > FrontViewPositionLeft;
+    BOOL disappear = newPosition <= FrontViewPositionLeft && (_rearViewPosition > FrontViewPositionLeft && _rearViewPosition != FrontViewPositionNone);
+    
+    if ( appear )
+        [_contentView prepareRearViewForPosition:newPosition];
+    
+    _rearViewPosition = newPosition;
+    
+    return [self _deploymentForViewController:_rearViewController inView:_contentView.rearView appear:appear disappear:disappear];
+}
+
+// Deploy/Undeploy of the right view controller following the containment principles. Returns a block
+// that must be invoked on animation completion in order to finish deployment
+- (void (^)(void))_rightViewDeploymentForNewFrontViewPosition:(FrontViewPosition)newPosition
+{
+    if ( _rightViewController == nil && newPosition < FrontViewPositionLeft )
+        newPosition = FrontViewPositionLeft;
+
+    BOOL appear = (_rightViewPosition >= FrontViewPositionLeft || _rightViewPosition == FrontViewPositionNone) && newPosition < FrontViewPositionLeft ;
+    BOOL disappear = newPosition >= FrontViewPositionLeft && (_rightViewPosition < FrontViewPositionLeft && _rightViewPosition != FrontViewPositionNone);
+    
+    if ( appear )
+        [_contentView prepareRightViewForPosition:newPosition];
+    
+    _rightViewPosition = newPosition;
+    
+    return [self _deploymentForViewController:_rightViewController inView:_contentView.rightView appear:appear disappear:disappear];
+}
+
+
+- (void (^)(void)) _deploymentForViewController:(UIViewController*)controller inView:(UIView*)view appear:(BOOL)appear disappear:(BOOL)disappear
+{
+    if ( appear ) return [self _deployForViewController:controller inView:view];
+    if ( disappear ) return [self _undeployForViewController:controller];
+    return ^{};
+}
+
+
+#pragma mark Containment view controller deployment and transition
+
+// Containment Deploy method. Returns a block to be invoked at the
+// animation completion, or right after return in case of non-animated deployment.
+- (void (^)(void))_deployForViewController:(UIViewController*)controller inView:(UIView*)view
+{
+    if ( !controller || !view )
+        return ^(void){};
+    
+    CGRect frame = view.bounds;
+    
+    UIView *controllerView = controller.view;
+    controllerView.autoresizingMask = UIViewAutoresizingFlexibleWidth | UIViewAutoresizingFlexibleHeight;
+    controllerView.frame = frame;
+    
+    if ( [controllerView isKindOfClass:[UIScrollView class]] )
+    {
+        BOOL adjust = controller.automaticallyAdjustsScrollViewInsets;
+        
+        if ( adjust )
+        {
+            [(id)controllerView setContentInset:UIEdgeInsetsMake(statusBarAdjustment(_contentView), 0, 0, 0)];
+        }
+    }
+    
+    [view addSubview:controllerView];
+    
+    void (^completionBlock)(void) = ^(void)
+    {
+        // nothing to do on completion at this stage
+    };
+    
+    return completionBlock;
+}
+
+// Containment Undeploy method. Returns a block to be invoked at the
+// animation completion, or right after return in case of non-animated deployment.
+- (void (^)(void))_undeployForViewController:(UIViewController*)controller
+{
+    if (!controller)
+        return ^(void){};
+
+    // nothing to do before completion at this stage
+    
+    void (^completionBlock)(void) = ^(void)
+    {
+        [controller.view removeFromSuperview];
+    };
+    
+    return completionBlock;
+}
+
+// Containment Transition method. Returns a block to be invoked at the
+// animation completion, or right after return in case of non-animated transition.
+- (void(^)(void))_transitionFromViewController:(UIViewController*)fromController toViewController:(UIViewController*)toController inView:(UIView*)view
+{
+    if ( fromController == toController )
+        return ^(void){};
+    
+    if ( toController ) [self addChildViewController:toController];
+    
+    void (^deployCompletion)() = [self _deployForViewController:toController inView:view];
+    
+    [fromController willMoveToParentViewController:nil];
+    
+    void (^undeployCompletion)() = [self _undeployForViewController:fromController];
+    
+    void (^completionBlock)(void) = ^(void)
+    {
+        undeployCompletion() ;
+        [fromController removeFromParentViewController];
+        
+        deployCompletion() ;
+        [toController didMoveToParentViewController:self];
+    };
+    return completionBlock;
+}
+
+// Load any defined front/rear controllers from the storyboard
+// This method is intended to be overrided in case the default behavior will not meet your needs
+- (void)loadStoryboardControllers
+{
+    if ( self.storyboard && _rearViewController == nil )
+    {
+        //Try each segue separately so it doesn't break prematurely if either Rear or Right views are not used.
+        @try
+        {
+            [self performSegueWithIdentifier:SWSegueRearIdentifier sender:nil];
+        }
+        @catch(NSException *exception) {}
+        
+        @try
+        {
+            [self performSegueWithIdentifier:SWSegueFrontIdentifier sender:nil];
+        }
+        @catch(NSException *exception) {}
+        
+        @try
+        {
+            [self performSegueWithIdentifier:SWSegueRightIdentifier sender:nil];
+        }
+        @catch(NSException *exception) {}
+    }
+}
+
+
+#pragma mark state preservation / restoration
+
++ (UIViewController *)viewControllerWithRestorationIdentifierPath:(NSArray *)identifierComponents coder:(NSCoder*)coder
+{
+    SWRevealViewController* vc = nil;
+    UIStoryboard* sb = [coder decodeObjectForKey:UIStateRestorationViewControllerStoryboardKey];
+    
+    if (sb)
+    {
+        vc = (SWRevealViewController*)[sb instantiateViewControllerWithIdentifier:@"SWRevealViewController"];
+        vc.restorationIdentifier = [identifierComponents lastObject];
+        vc.restorationClass = [SWRevealViewController class];
+    }
+    return vc;
+}
+
+
+- (void)encodeRestorableStateWithCoder:(NSCoder *)coder
+{
+    [coder encodeDouble:_rearViewRevealWidth forKey:@"_rearViewRevealWidth"];
+    [coder encodeDouble:_rearViewRevealOverdraw forKey:@"_rearViewRevealOverdraw"];
+    [coder encodeDouble:_rearViewRevealDisplacement forKey:@"_rearViewRevealDisplacement"];
+    [coder encodeDouble:_rightViewRevealWidth forKey:@"_rightViewRevealWidth"];
+    [coder encodeDouble:_rightViewRevealOverdraw forKey:@"_rightViewRevealOverdraw"];
+    [coder encodeDouble:_rightViewRevealDisplacement forKey:@"_rightViewRevealDisplacement"];
+    [coder encodeBool:_bounceBackOnOverdraw forKey:@"_bounceBackOnOverdraw"];
+    [coder encodeBool:_bounceBackOnLeftOverdraw forKey:@"_bounceBackOnLeftOverdraw"];
+    [coder encodeBool:_stableDragOnOverdraw forKey:@"_stableDragOnOverdraw"];
+    [coder encodeBool:_stableDragOnLeftOverdraw forKey:@"_stableDragOnLeftOverdraw"];
+    [coder encodeBool:_presentFrontViewHierarchically forKey:@"_presentFrontViewHierarchically"];
+    [coder encodeDouble:_quickFlickVelocity forKey:@"_quickFlickVelocity"];
+    [coder encodeDouble:_toggleAnimationDuration forKey:@"_toggleAnimationDuration"];
+    [coder encodeInteger:_toggleAnimationType forKey:@"_toggleAnimationType"];
+    [coder encodeDouble:_springDampingRatio forKey:@"_springDampingRatio"];
+    [coder encodeDouble:_replaceViewAnimationDuration forKey:@"_replaceViewAnimationDuration"];
+    [coder encodeDouble:_frontViewShadowRadius forKey:@"_frontViewShadowRadius"];
+    [coder encodeCGSize:_frontViewShadowOffset forKey:@"_frontViewShadowOffset"];
+    [coder encodeDouble:_frontViewShadowOpacity forKey:@"_frontViewShadowOpacity"];
+    [coder encodeObject:_frontViewShadowColor forKey:@"_frontViewShadowColor"];
+    [coder encodeBool:_userInteractionStore forKey:@"_userInteractionStore"];
+    [coder encodeDouble:_draggableBorderWidth forKey:@"_draggableBorderWidth"];
+    [coder encodeBool:_clipsViewsToBounds forKey:@"_clipsViewsToBounds"];
+    [coder encodeBool:_extendsPointInsideHit forKey:@"_extendsPointInsideHit"];
+    
+    [coder encodeObject:_rearViewController forKey:@"_rearViewController"];
+    [coder encodeObject:_frontViewController forKey:@"_frontViewController"];
+    [coder encodeObject:_rightViewController forKey:@"_rightViewController"];
+    
+    [coder encodeInteger:_frontViewPosition  forKey:@"_frontViewPosition"];
+    
+    [super encodeRestorableStateWithCoder:coder];
+}
+
+
+- (void)decodeRestorableStateWithCoder:(NSCoder *)coder
+{
+    _rearViewRevealWidth = [coder decodeDoubleForKey:@"_rearViewRevealWidth"];
+    _rearViewRevealOverdraw = [coder decodeDoubleForKey:@"_rearViewRevealOverdraw"];
+    _rearViewRevealDisplacement = [coder decodeDoubleForKey:@"_rearViewRevealDisplacement"];
+    _rightViewRevealWidth = [coder decodeDoubleForKey:@"_rightViewRevealWidth"];
+    _rightViewRevealOverdraw = [coder decodeDoubleForKey:@"_rightViewRevealOverdraw"];
+    _rightViewRevealDisplacement = [coder decodeDoubleForKey:@"_rightViewRevealDisplacement"];
+    _bounceBackOnOverdraw = [coder decodeBoolForKey:@"_bounceBackOnOverdraw"];
+    _bounceBackOnLeftOverdraw = [coder decodeBoolForKey:@"_bounceBackOnLeftOverdraw"];
+    _stableDragOnOverdraw = [coder decodeBoolForKey:@"_stableDragOnOverdraw"];
+    _stableDragOnLeftOverdraw = [coder decodeBoolForKey:@"_stableDragOnLeftOverdraw"];
+    _presentFrontViewHierarchically = [coder decodeBoolForKey:@"_presentFrontViewHierarchically"];
+    _quickFlickVelocity = [coder decodeDoubleForKey:@"_quickFlickVelocity"];
+    _toggleAnimationDuration = [coder decodeDoubleForKey:@"_toggleAnimationDuration"];
+    _toggleAnimationType = [coder decodeIntegerForKey:@"_toggleAnimationType"];
+    _springDampingRatio = [coder decodeDoubleForKey:@"_springDampingRatio"];
+    _replaceViewAnimationDuration = [coder decodeDoubleForKey:@"_replaceViewAnimationDuration"];
+    _frontViewShadowRadius = [coder decodeDoubleForKey:@"_frontViewShadowRadius"];
+    _frontViewShadowOffset = [coder decodeCGSizeForKey:@"_frontViewShadowOffset"];
+    _frontViewShadowOpacity = [coder decodeDoubleForKey:@"_frontViewShadowOpacity"];
+    _frontViewShadowColor = [coder decodeObjectForKey:@"_frontViewShadowColor"];
+    _userInteractionStore = [coder decodeBoolForKey:@"_userInteractionStore"];
+    _animationQueue = [NSMutableArray array];
+    _draggableBorderWidth = [coder decodeDoubleForKey:@"_draggableBorderWidth"];
+    _clipsViewsToBounds = [coder decodeBoolForKey:@"_clipsViewsToBounds"];
+    _extendsPointInsideHit = [coder decodeBoolForKey:@"_extendsPointInsideHit"];
+
+    [self setRearViewController:[coder decodeObjectForKey:@"_rearViewController"]];
+    [self setFrontViewController:[coder decodeObjectForKey:@"_frontViewController"]];
+    [self setRightViewController:[coder decodeObjectForKey:@"_rightViewController"]];
+    
+    [self setFrontViewPosition:[coder decodeIntForKey: @"_frontViewPosition"]];
+    
+    [super decodeRestorableStateWithCoder:coder];
+}
+
+
+- (void)applicationFinishedRestoringState
+{
+    // nothing to do at this stage
+}
+
+
+@end
+
+
+#pragma mark - UIViewController(SWRevealViewController) Category
+
+@implementation UIViewController(SWRevealViewController)
+
+- (SWRevealViewController*)revealViewController
+{
+    UIViewController *parent = self;
+    Class revealClass = [SWRevealViewController class];
+    while ( nil != (parent = [parent parentViewController]) && ![parent isKindOfClass:revealClass] ) {}
+    return (id)parent;
+}
+
+@end
+
+
+#pragma mark - SWRevealViewControllerSegueSetController segue identifiers
+
+NSString * const SWSegueRearIdentifier = @"sw_rear";
+NSString * const SWSegueFrontIdentifier = @"sw_front";
+NSString * const SWSegueRightIdentifier = @"sw_right";
+
+
+#pragma mark - SWRevealViewControllerSegueSetController class
+
+@implementation SWRevealViewControllerSegueSetController
+
+- (void)perform
+{
+    SWRevealControllerOperation operation = SWRevealControllerOperationNone;
+    
+    NSString *identifier = self.identifier;
+    SWRevealViewController *rvc = self.sourceViewController;
+    UIViewController *dvc = self.destinationViewController;
+    
+    if ( [identifier isEqualToString:SWSegueFrontIdentifier] )
+        operation = SWRevealControllerOperationReplaceFrontController;
+    
+    else if ( [identifier isEqualToString:SWSegueRearIdentifier] )
+        operation = SWRevealControllerOperationReplaceRearController;
+    
+    else if ( [identifier isEqualToString:SWSegueRightIdentifier] )
+        operation = SWRevealControllerOperationReplaceRightController;
+    
+    if ( operation != SWRevealControllerOperationNone )
+        [rvc _performTransitionOperation:operation withViewController:dvc animated:NO];
+}
+
+@end
+
+
+#pragma mark - SWRevealViewControllerSeguePushController class
+
+@implementation SWRevealViewControllerSeguePushController
+
+- (void)perform
+{
+    SWRevealViewController *rvc = [self.sourceViewController revealViewController];
+    UIViewController *dvc = self.destinationViewController;
+    [rvc pushFrontViewController:dvc animated:YES];
+}
+
+@end
+
+
+//#pragma mark - SWRevealViewControllerSegue Class
+//
+//@implementation SWRevealViewControllerSegue  // DEPRECATED
+//
+//- (void)perform
+//{
+//    if ( _performBlock )
+//        _performBlock( self, self.sourceViewController, self.destinationViewController );
+//}
+//
+//@end
+//
+//
+//#pragma mark Storyboard support
+//
+//@implementation SWRevealViewController(deprecated)
+//
+//- (void)prepareForSegue:(SWRevealViewControllerSegue *)segue sender:(id)sender   // TO REMOVE: DEPRECATED IMPLEMENTATION
+//{
+//    // This method is required for compatibility with SWRevealViewControllerSegue, now deprecated.
+//    // It can be simply removed when using SWRevealViewControllerSegueSetController and SWRevealViewControlerSeguePushController
+//    
+//    NSString *identifier = segue.identifier;
+//    if ( [segue isKindOfClass:[SWRevealViewControllerSegue class]] && sender == nil )
+//    {
+//        if ( [identifier isEqualToString:SWSegueRearIdentifier] )
+//        {
+//            segue.performBlock = ^(SWRevealViewControllerSegue* rvc_segue, UIViewController* svc, UIViewController* dvc)
+//            {
+//                [self _setRearViewController:dvc animated:NO];
+//            };
+//        }
+//        else if ( [identifier isEqualToString:SWSegueFrontIdentifier] )
+//        {
+//            segue.performBlock = ^(SWRevealViewControllerSegue* rvc_segue, UIViewController* svc, UIViewController* dvc)
+//            {
+//                [self _setFrontViewController:dvc animated:NO];
+//            };
+//        }
+//        else if ( [identifier isEqualToString:SWSegueRightIdentifier] )
+//        {
+//            segue.performBlock = ^(SWRevealViewControllerSegue* rvc_segue, UIViewController* svc, UIViewController* dvc)
+//            {
+//                [self _setRightViewController:dvc animated:NO];
+//            };
+//        }
+//    }
+//}
+//
+//@end
+
+

Limelight/ViewControllers/SettingsViewController.h

@@ -0,0 +1,21 @@
+//
+//  SettingsViewController.h
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/27/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import <UIKit/UIKit.h>
+#import "AppDelegate.h"
+
+@interface SettingsViewController : UIViewController
+@property (strong, nonatomic) IBOutlet UILabel *bitrateLabel;
+@property (strong, nonatomic) IBOutlet UISlider *bitrateSlider;
+@property (strong, nonatomic) IBOutlet UISegmentedControl *framerateSelector;
+@property (strong, nonatomic) IBOutlet UISegmentedControl *resolutionSelector;
+@property (strong, nonatomic) IBOutlet UISegmentedControl *onscreenControlSelector;
+
+- (void) saveSettings;
+
+@end

Limelight/ViewControllers/SettingsViewController.m

@@ -0,0 +1,93 @@
+//
+//  SettingsViewController.m
+//  Limelight
+//
+//  Created by Diego Waxemberg on 10/27/14.
+//  Copyright (c) 2014 Limelight Stream. All rights reserved.
+//
+
+#import "SettingsViewController.h"
+#import "Settings.h"
+#import "DataManager.h"
+
+#define BITRATE_INTERVAL 500 // in kbps
+
+@implementation SettingsViewController {
+    NSInteger _bitrate;
+}
+static NSString* bitrateFormat = @"Bitrate: %.1f Mbps";
+
+
+- (void)viewDidLoad {
+    [super viewDidLoad];
+    
+    DataManager* dataMan = [[DataManager alloc] init];
+    Settings* currentSettings = [dataMan retrieveSettings];
+    
+    // Bitrate is persisted in kbps
+    _bitrate = [currentSettings.bitrate integerValue];
+    NSInteger framerate = [currentSettings.framerate integerValue] == 30 ? 0 : 1;
+    NSInteger resolution;
+    if ([currentSettings.height integerValue] == 720) {
+        resolution = 0;
+    } else if ([currentSettings.height integerValue] == 1080) {
+        resolution = 1;
+    } else {
+        resolution = 2;
+    }
+    NSInteger onscreenControls = [currentSettings.onscreenControls integerValue];
+    
+    [self.resolutionSelector setSelectedSegmentIndex:resolution];
+    [self.framerateSelector setSelectedSegmentIndex:framerate];
+    [self.onscreenControlSelector setSelectedSegmentIndex:onscreenControls];
+    [self.bitrateSlider setValue:(_bitrate / 1000) animated:YES];
+    [self.bitrateSlider addTarget:self action:@selector(bitrateSliderMoved) forControlEvents:UIControlEventValueChanged];
+    [self updateBitrateText];
+}
+
+- (void) bitrateSliderMoved {
+    _bitrate = BITRATE_INTERVAL * (int)self.bitrateSlider.value;
+    [self updateBitrateText];
+}
+
+- (void) updateBitrateText {
+    // Display bitrate in Mbps
+    [self.bitrateLabel setText:[NSString stringWithFormat:bitrateFormat, _bitrate / 1000.]];
+}
+
+- (void) saveSettings {
+    DataManager* dataMan = [[DataManager alloc] init];
+    NSInteger framerate = [self.framerateSelector selectedSegmentIndex] == 0 ? 30 : 60;
+    NSInteger height;
+    NSInteger width;
+    if ([self.resolutionSelector selectedSegmentIndex] == 2) {
+        // Get screen native resolution
+        height = [UIScreen mainScreen].bounds.size.height * [UIScreen mainScreen].scale;
+        width = [UIScreen mainScreen].bounds.size.width * [UIScreen mainScreen].scale;
+        
+        UIAlertController *alertResolution = [UIAlertController alertControllerWithTitle:@"Native resolution" message:[NSString stringWithFormat:@"You must select the following resolution in the game settings: %lix%li", (long)width, (long)height] preferredStyle:UIAlertControllerStyleAlert];
+        [alertResolution addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleCancel handler:nil]];
+        [self presentViewController:alertResolution animated:YES completion:nil];
+    }
+    else
+    {
+        height = [self.resolutionSelector selectedSegmentIndex] == 0 ? 720 : 1080;
+        width = height == 720 ? 1280 : 1920;
+    }
+    NSInteger onscreenControls = [self.onscreenControlSelector selectedSegmentIndex];
+    [dataMan saveSettingsWithBitrate:_bitrate framerate:framerate height:height width:width onscreenControls:onscreenControls];
+}
+
+- (void)didReceiveMemoryWarning {
+    [super didReceiveMemoryWarning];
+    // Dispose of any resources that can be recreated.
+}
+
+
+#pragma mark - Navigation
+
+- (void)prepareForSegue:(UIStoryboardSegue *)segue sender:(id)sender {
+}
+
+
+@end

Limelight/ViewControllers/StreamFrameViewController.h

@@ -7,9 +7,13 @@
 //
 
 #import "Connection.h"
+#import "StreamConfiguration.h"
 
 #import <UIKit/UIKit.h>
 
-@interface StreamFrameViewController : UIViewController <ConTermCallback>
+@interface StreamFrameViewController : UIViewController <ConnectionCallbacks>
+@property (strong, nonatomic) IBOutlet UILabel *stageLabel;
+@property (strong, nonatomic) IBOutlet UIActivityIndicatorView *spinner;
+@property (nonatomic) StreamConfiguration* streamConfig;
 
 @end

Limelight/ViewControllers/StreamFrameViewController.m

@@ -11,6 +11,7 @@
 #import "VideoDecoderRenderer.h"
 #import "StreamManager.h"
 #import "ControllerSupport.h"
+#import "StreamView.h"
 
 #include <sys/socket.h>
 #include <netinet/in.h>
@@ -24,12 +25,20 @@
 - (void)viewDidLoad
 {
     [super viewDidLoad];
-
+    
+    [self.navigationController setNavigationBarHidden:YES animated:YES];
+    
+    [self.stageLabel setText:@"Starting App"];
+    [self.stageLabel sizeToFit];
+    self.stageLabel.center = CGPointMake(self.view.frame.size.width / 2, self.view.frame.size.height / 2);
+    self.spinner.center = CGPointMake(self.view.frame.size.width / 2, self.view.frame.size.height / 2 - self.stageLabel.frame.size.height - self.spinner.frame.size.height);
     [UIApplication sharedApplication].idleTimerDisabled = YES;
     
     _controllerSupport = [[ControllerSupport alloc] init];
     
-    _streamMan = [[StreamManager alloc] initWithConfig:[MainFrameViewController getStreamConfiguration] renderView:self.view connectionTerminatedCallback:self];
+    _streamMan = [[StreamManager alloc] initWithConfig:self.streamConfig
+                                            renderView:self.view
+                                   connectionCallbacks:self];
     NSOperationQueue* opQueue = [[NSOperationQueue alloc] init];
     [opQueue addOperation:_streamMan];
     
@@ -39,19 +48,94 @@
                                                object:nil];
 }
 
-- (void)applicationWillResignActive:(NSNotification *)notification {
-    [_streamMan stopStream];
-    [self performSegueWithIdentifier:@"returnToMainFrame" sender:self];
+- (void) returnToMainFrame {
+    [_controllerSupport cleanup];
+    [self.navigationController popToRootViewControllerAnimated:YES];
 }
 
-- (void)connectionTerminated {
-    UIAlertController* conTermAlert = [UIAlertController alertControllerWithTitle:@"Connection Terminated" message:@"The connection terminated unexpectedly" preferredStyle:UIAlertControllerStyleAlert];
-    [conTermAlert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action){
-        [self performSegueWithIdentifier:@"returnToMainFrame" sender:self];
-    }]];
-    [self presentViewController:conTermAlert animated:YES completion:nil];
-    
+- (void)applicationWillResignActive:(NSNotification *)notification {
     [_streamMan stopStream];
+    [self returnToMainFrame];
+}
+
+- (void)edgeSwiped {
+    Log(LOG_D, @"User swiped to end stream");
+    [_streamMan stopStream];
+    [self returnToMainFrame];
+}
+
+- (void) connectionStarted {
+    Log(LOG_I, @"Connection started");
+    dispatch_async(dispatch_get_main_queue(), ^{
+        [self.spinner stopAnimating];
+        [self.stageLabel setText:@"Waiting for first frame..."];
+        [self.stageLabel sizeToFit];
+        [(StreamView*)self.view setupOnScreenControls: _controllerSupport];
+        UIScreenEdgePanGestureRecognizer* swipeGesture = [[UIScreenEdgePanGestureRecognizer alloc] initWithTarget:self action:@selector(edgeSwiped)];
+        swipeGesture.edges = UIRectEdgeLeft;
+        if (swipeGesture == nil) {
+            Log(LOG_E, @"An error occured trying to create UIScreenEdgePanGestureRecognizer");
+        } else {
+            [self.view addGestureRecognizer:swipeGesture];
+        }
+    });
+}
+
+- (void)connectionTerminated:(long)errorCode {
+    Log(LOG_I, @"Connection terminated: %ld", errorCode);
+    
+    dispatch_async(dispatch_get_main_queue(), ^{
+        UIAlertController* conTermAlert = [UIAlertController alertControllerWithTitle:@"Connection Terminated" message:@"The connection was terminated" preferredStyle:UIAlertControllerStyleAlert];
+        [conTermAlert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action){
+            [self returnToMainFrame];
+        }]];
+        [self presentViewController:conTermAlert animated:YES completion:nil];
+    });
+
+    [_streamMan stopStreamInternal];
+}
+
+- (void) stageStarting:(char*)stageName {
+    Log(LOG_I, @"Starting %s", stageName);
+    dispatch_async(dispatch_get_main_queue(), ^{
+        NSString* lowerCase = [NSString stringWithFormat:@"%s in progress...", stageName];
+        NSString* titleCase = [[[lowerCase substringToIndex:1] uppercaseString] stringByAppendingString:[lowerCase substringFromIndex:1]];
+        [self.stageLabel setText:titleCase];
+        [self.stageLabel sizeToFit];
+        self.stageLabel.center = CGPointMake(self.view.frame.size.width / 2, self.stageLabel.center.y);
+    });
+}
+
+- (void) stageComplete:(char*)stageName {
+}
+
+- (void) stageFailed:(char*)stageName withError:(long)errorCode {
+    UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Connection Failed"
+                                                                   message:[NSString stringWithFormat:@"%s failed with error %ld",
+                                                                            stageName, errorCode]
+                                                            preferredStyle:UIAlertControllerStyleAlert];
+    [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action){
+        [self returnToMainFrame];
+    }]];
+    [self presentViewController:alert animated:YES completion:nil];
+}
+
+- (void) launchFailed:(NSString*)message {
+    UIAlertController* alert = [UIAlertController alertControllerWithTitle:@"Connection Failed"
+                                                                   message:message
+                                                            preferredStyle:UIAlertControllerStyleAlert];
+    [alert addAction:[UIAlertAction actionWithTitle:@"Ok" style:UIAlertActionStyleDestructive handler:^(UIAlertAction* action){
+        [self returnToMainFrame];
+    }]];
+    [self presentViewController:alert animated:YES completion:nil];
+}
+
+- (void) displayMessage:(char*)message {
+    Log(LOG_I, @"Display message: %s", message);
+}
+
+- (void) displayTransientMessage:(char*)message {
+    Log(LOG_I, @"Display transient message: %s", message);
 }
 
 - (void)didReceiveMemoryWarning
@@ -63,13 +147,4 @@
 - (BOOL)shouldAutorotate {
     return YES;
 }
-
-- (NSUInteger)supportedInterfaceOrientations {
-    return UIInterfaceOrientationMaskLandscapeLeft | UIInterfaceOrientationMaskLandscapeRight;
-}
-
-- (UIInterfaceOrientation)preferredInterfaceOrientationForPresentation {
-    return UIInterfaceOrientationLandscapeRight;
-}
-
 @end

MainFrame-iPad.storyboard

@@ -1,133 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" useAutolayout="YES" initialViewController="wb7-af-jn8">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
-    </dependencies>
-    <scenes>
-        <!--Main Frame View Controller-->
-        <scene sceneID="Me4-Nr-liz">
-            <objects>
-                <viewController id="wb7-af-jn8" customClass="MainFrameViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="9ZL-gP-cfY"/>
-                        <viewControllerLayoutGuide type="bottom" id="Shd-7C-CVq"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" horizontalHuggingPriority="222" id="ugc-rC-3gm">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="bJR-sz-8uh">
-                                <rect key="frame" x="0.0" y="80" width="1024" height="216"/>
-                                <connections>
-                                    <outlet property="dataSource" destination="wb7-af-jn8" id="EW1-pG-aj0"/>
-                                    <outlet property="delegate" destination="wb7-af-jn8" id="Piq-cV-gxM"/>
-                                </connections>
-                            </pickerView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="taW-Um-zc6" userLabel="Start Stream Btn">
-                                <rect key="frame" x="317" y="273" width="391" height="141"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="391" id="f7x-eA-edG"/>
-                                    <constraint firstAttribute="height" constant="141" id="sdD-TL-lHS"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="26"/>
-                                <state key="normal" title="Start Streaming Steam!">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <connections>
-                                    <action selector="StreamButton:" destination="wb7-af-jn8" eventType="touchUpInside" id="u2m-8A-Tor"/>
-                                </connections>
-                            </button>
-                            <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="rnA-uG-hAA">
-                                <rect key="frame" x="0.0" y="380" width="1024" height="216"/>
-                                <connections>
-                                    <outlet property="dataSource" destination="wb7-af-jn8" id="25E-op-oh6"/>
-                                    <outlet property="delegate" destination="wb7-af-jn8" id="gjZ-oj-THD"/>
-                                </connections>
-                            </pickerView>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="0Nz-KX-Du4" userLabel="Pair Btn">
-                                <rect key="frame" x="439" y="595" width="147" height="36"/>
-                                <constraints>
-                                    <constraint firstAttribute="height" constant="36" id="C4p-5e-fbL"/>
-                                    <constraint firstAttribute="width" constant="147" id="I0J-8h-40c"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="26"/>
-                                <state key="normal" title="Pair with PC">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <connections>
-                                    <action selector="PairButton:" destination="wb7-af-jn8" eventType="touchUpInside" id="Ct1-6m-aYg"/>
-                                </connections>
-                            </button>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Geforce Host" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="OCq-Pr-kFE">
-                                <rect key="frame" x="233" y="235" width="601" height="30"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="601" id="haa-mB-l8k"/>
-                                </constraints>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits"/>
-                                <connections>
-                                    <outlet property="delegate" destination="wb7-af-jn8" id="YMu-2k-Dyk"/>
-                                </connections>
-                            </textField>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="taW-Um-zc6" firstAttribute="top" secondItem="OCq-Pr-kFE" secondAttribute="bottom" constant="8" symbolic="YES" id="7GU-HB-BX8"/>
-                            <constraint firstItem="OCq-Pr-kFE" firstAttribute="leading" secondItem="ugc-rC-3gm" secondAttribute="leading" constant="233" id="DM7-XL-gaO"/>
-                            <constraint firstAttribute="centerX" secondItem="rnA-uG-hAA" secondAttribute="centerX" id="EBV-fm-cGh"/>
-                            <constraint firstItem="taW-Um-zc6" firstAttribute="top" secondItem="ugc-rC-3gm" secondAttribute="top" constant="273" id="Gki-EV-x7L"/>
-                            <constraint firstItem="rnA-uG-hAA" firstAttribute="trailing" secondItem="bJR-sz-8uh" secondAttribute="trailing" id="RKH-ES-jQD"/>
-                            <constraint firstItem="rnA-uG-hAA" firstAttribute="leading" secondItem="bJR-sz-8uh" secondAttribute="leading" id="UNO-rw-Z5K"/>
-                            <constraint firstItem="taW-Um-zc6" firstAttribute="centerX" secondItem="rnA-uG-hAA" secondAttribute="centerX" id="clq-Co-82x"/>
-                            <constraint firstItem="Shd-7C-CVq" firstAttribute="top" secondItem="rnA-uG-hAA" secondAttribute="bottom" constant="172" id="gRA-PG-Iqy"/>
-                            <constraint firstItem="Shd-7C-CVq" firstAttribute="top" secondItem="0Nz-KX-Du4" secondAttribute="bottom" constant="137" id="nJf-9A-cfP"/>
-                            <constraint firstItem="rnA-uG-hAA" firstAttribute="centerX" secondItem="0Nz-KX-Du4" secondAttribute="centerX" id="toQ-ei-Pr0"/>
-                            <constraint firstItem="rnA-uG-hAA" firstAttribute="top" secondItem="bJR-sz-8uh" secondAttribute="bottom" constant="84" id="zMG-gd-Hxd"/>
-                            <constraint firstItem="rnA-uG-hAA" firstAttribute="leading" secondItem="ugc-rC-3gm" secondAttribute="leading" id="znq-P0-UWg"/>
-                        </constraints>
-                    </view>
-                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
-                    <connections>
-                        <outlet property="HostPicker" destination="bJR-sz-8uh" id="pWB-P3-ZJ2"/>
-                        <outlet property="StreamConfigs" destination="rnA-uG-hAA" id="LPP-jQ-5eW"/>
-                        <outlet property="hostTextField" destination="OCq-Pr-kFE" id="HS2-KF-inc"/>
-                        <segue destination="OIm-0n-i9v" kind="modal" identifier="createStreamFrame" modalPresentationStyle="fullScreen" id="MOD-9A-3Sk"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="ZYl-Xu-QyD" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="-375" y="-162"/>
-        </scene>
-        <!--Stream Frame View Controller-->
-        <scene sceneID="RuD-qk-7nb">
-            <objects>
-                <viewController storyboardIdentifier="MainFrame" id="OIm-0n-i9v" customClass="StreamFrameViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="NG3-N1-D4k"/>
-                        <viewControllerLayoutGuide type="bottom" id="3MH-n6-BSR"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="VPm-Ae-rc4" userLabel="RenderView" customClass="StreamView">
-                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                    <nil key="simulatedStatusBarMetrics"/>
-                    <nil key="simulatedTopBarMetrics"/>
-                    <nil key="simulatedBottomBarMetrics"/>
-                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
-                    <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
-                    <connections>
-                        <segue destination="wb7-af-jn8" kind="modal" identifier="returnToMainFrame" id="Ryr-0y-o43"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="hON-k2-Efa" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="1252" y="-312"/>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="lightContent"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination"/>
-    </simulatedMetricsContainer>
-</document>

MainFrame-iPhone.storyboard

@@ -1,125 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6250" systemVersion="14A388a" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" initialViewController="dgh-JZ-Q7z">
-    <dependencies>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6244"/>
-    </dependencies>
-    <scenes>
-        <!--Main Frame View Controller-->
-        <scene sceneID="emz-kO-L7q">
-            <objects>
-                <viewController id="dgh-JZ-Q7z" customClass="MainFrameViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="0HR-9w-kvY"/>
-                        <viewControllerLayoutGuide type="bottom" id="2rs-P3-zn7"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="eqF-iA-Rqx">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <subviews>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="J5M-pv-UHA">
-                                <rect key="frame" x="82" y="303" width="156" height="30"/>
-                                <state key="normal" title="Start Streaming Steam">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <connections>
-                                    <action selector="StreamButton:" destination="dgh-JZ-Q7z" eventType="touchUpInside" id="3Bj-I0-bKs"/>
-                                </connections>
-                            </button>
-                            <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="ATh-Tf-xRL">
-                                <rect key="frame" x="137" y="341" width="46" height="30"/>
-                                <constraints>
-                                    <constraint firstAttribute="width" constant="46" id="mm8-gm-flQ"/>
-                                </constraints>
-                                <state key="normal" title="Pair">
-                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
-                                </state>
-                                <connections>
-                                    <action selector="PairButton:" destination="dgh-JZ-Q7z" eventType="touchUpInside" id="jHN-B5-hsw"/>
-                                </connections>
-                            </button>
-                            <pickerView contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0xb-lk-PHK">
-                                <rect key="frame" x="0.0" y="354" width="320" height="162"/>
-                                <connections>
-                                    <outlet property="dataSource" destination="dgh-JZ-Q7z" id="R0Y-EX-neJ"/>
-                                    <outlet property="delegate" destination="dgh-JZ-Q7z" id="mkk-oI-y7K"/>
-                                </connections>
-                            </pickerView>
-                            <pickerView contentMode="scaleToFill" verticalHuggingPriority="249" translatesAutoresizingMaskIntoConstraints="NO" id="nFR-to-qQs">
-                                <rect key="frame" x="0.0" y="0.0" width="320" height="216"/>
-                                <connections>
-                                    <outlet property="dataSource" destination="dgh-JZ-Q7z" id="C28-Eh-A6L"/>
-                                    <outlet property="delegate" destination="dgh-JZ-Q7z" id="dTy-8g-aj1"/>
-                                </connections>
-                            </pickerView>
-                            <textField opaque="NO" clipsSubviews="YES" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="center" borderStyle="roundedRect" placeholder="Geforce Host" minimumFontSize="17" translatesAutoresizingMaskIntoConstraints="NO" id="unc-nO-WPH">
-                                <rect key="frame" x="16" y="224" width="288" height="30"/>
-                                <fontDescription key="fontDescription" type="system" pointSize="14"/>
-                                <textInputTraits key="textInputTraits"/>
-                                <connections>
-                                    <outlet property="delegate" destination="dgh-JZ-Q7z" id="DCy-4m-RHG"/>
-                                </connections>
-                            </textField>
-                        </subviews>
-                        <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="calibratedWhite"/>
-                        <constraints>
-                            <constraint firstItem="0xb-lk-PHK" firstAttribute="leading" secondItem="2rs-P3-zn7" secondAttribute="leading" id="350-bN-0q6"/>
-                            <constraint firstAttribute="centerX" secondItem="J5M-pv-UHA" secondAttribute="centerX" id="5jf-C1-faJ"/>
-                            <constraint firstItem="unc-nO-WPH" firstAttribute="top" secondItem="0HR-9w-kvY" secondAttribute="bottom" constant="224" id="A1r-Mh-dg7"/>
-                            <constraint firstAttribute="centerX" secondItem="0xb-lk-PHK" secondAttribute="centerX" id="By0-u3-3MA"/>
-                            <constraint firstItem="0xb-lk-PHK" firstAttribute="centerX" secondItem="J5M-pv-UHA" secondAttribute="centerX" id="Gab-EA-Il5"/>
-                            <constraint firstItem="unc-nO-WPH" firstAttribute="leading" secondItem="J5M-pv-UHA" secondAttribute="leading" constant="-66" id="Qk0-0J-79M"/>
-                            <constraint firstItem="0xb-lk-PHK" firstAttribute="top" secondItem="J5M-pv-UHA" secondAttribute="bottom" constant="21" id="RNw-zD-7u7"/>
-                            <constraint firstItem="0xb-lk-PHK" firstAttribute="top" secondItem="ATh-Tf-xRL" secondAttribute="bottom" constant="-17" id="TN4-kv-Yli"/>
-                            <constraint firstItem="J5M-pv-UHA" firstAttribute="top" secondItem="nFR-to-qQs" secondAttribute="bottom" constant="87" id="Vcz-ix-cdp"/>
-                            <constraint firstItem="nFR-to-qQs" firstAttribute="top" secondItem="0HR-9w-kvY" secondAttribute="bottom" id="XWH-Vw-VfH"/>
-                            <constraint firstItem="0xb-lk-PHK" firstAttribute="centerX" secondItem="ATh-Tf-xRL" secondAttribute="centerX" id="bEv-zi-oip"/>
-                            <constraint firstItem="J5M-pv-UHA" firstAttribute="top" secondItem="unc-nO-WPH" secondAttribute="bottom" constant="49" id="dU2-fJ-SU7"/>
-                            <constraint firstItem="ATh-Tf-xRL" firstAttribute="top" secondItem="J5M-pv-UHA" secondAttribute="bottom" constant="8" id="gNc-KC-Q9G"/>
-                            <constraint firstItem="unc-nO-WPH" firstAttribute="trailing" secondItem="J5M-pv-UHA" secondAttribute="trailing" constant="66" id="h4a-vk-mBB"/>
-                            <constraint firstAttribute="centerX" secondItem="nFR-to-qQs" secondAttribute="centerX" id="h9S-ek-7bf"/>
-                        </constraints>
-                    </view>
-                    <toolbarItems/>
-                    <simulatedToolbarMetrics key="simulatedBottomBarMetrics"/>
-                    <connections>
-                        <outlet property="HostPicker" destination="nFR-to-qQs" id="lTE-tT-lYY"/>
-                        <outlet property="StreamConfigs" destination="0xb-lk-PHK" id="VxB-Ur-PNy"/>
-                        <outlet property="hostTextField" destination="unc-nO-WPH" id="MbD-KQ-MoG"/>
-                        <segue destination="mI3-9F-XwU" kind="modal" identifier="createStreamFrame" id="cPc-eP-un1"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="HNf-lX-GEO" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="131" y="0.0"/>
-        </scene>
-        <!--Stream Frame View Controller-->
-        <scene sceneID="5Eb-q2-vjt">
-            <objects>
-                <viewController id="mI3-9F-XwU" customClass="StreamFrameViewController" sceneMemberID="viewController">
-                    <layoutGuides>
-                        <viewControllerLayoutGuide type="top" id="DRq-YB-9Rh"/>
-                        <viewControllerLayoutGuide type="bottom" id="KH1-hM-RYW"/>
-                    </layoutGuides>
-                    <view key="view" contentMode="scaleToFill" id="eir-e9-IPE" customClass="StreamView">
-                        <rect key="frame" x="0.0" y="0.0" width="320" height="568"/>
-                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
-                        <color key="backgroundColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
-                    </view>
-                    <nil key="simulatedStatusBarMetrics"/>
-                    <nil key="simulatedTopBarMetrics"/>
-                    <nil key="simulatedBottomBarMetrics"/>
-                    <connections>
-                        <segue destination="dgh-JZ-Q7z" kind="modal" identifier="returnToMainFrame" id="djB-MF-L5D"/>
-                    </connections>
-                </viewController>
-                <placeholder placeholderIdentifier="IBFirstResponder" id="pqv-jd-33O" userLabel="First Responder" sceneMemberID="firstResponder"/>
-            </objects>
-            <point key="canvasLocation" x="584" y="0.0"/>
-        </scene>
-    </scenes>
-    <simulatedMetricsContainer key="defaultSimulatedMetrics">
-        <simulatedStatusBarMetrics key="statusBar"/>
-        <simulatedOrientationMetrics key="orientation"/>
-        <simulatedScreenMetrics key="destination" type="retina4"/>
-    </simulatedMetricsContainer>
-</document>

README.md

@@ -1,14 +1,12 @@
 #Limelight iOS
 
-[Limelight](https://github.com/limelight-stream) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield, but built for iOS. Limelight iOS will allow you to stream your full collection of Steam games from
+[Limelight](https://github.com/limelight-stream) is an open source implementation of NVIDIA's GameStream, as used by the NVIDIA Shield, but built for iOS. Limelight iOS allows you to stream your full collection of Steam games from
 your powerful desktop computer to your iOS Device.
 
-#####Limelight iOS is not stable or buildable - it is in the very early stages of development. Please refrain from opening issues regarding Limelight iOS - we know it doesn't work yet.
+This is actively being developed and will be available on the App Store soon - check back here or on [our website](http://limelight-stream.com) for updates.
 
-This is in development and is not considered stable (or buildable). Do not use it. It is not ready.
+We understand that Limelight users are eager for the opportunity to stream their Steam collection to their iOS devices. Limelight for iOS is in the testing stage and preliminary versions are available for beta testers.
 
-We understand that Limelight users are eager for the opportunity to stream their Steam collection to their iOS devices. Currently there is no ETA on an alpha version, but we'll post an update whenever we reach that stage.
-
-In the meantime, check out the existing versions for [Android](https://github.com/limelight-stream/limelight-android) and [PC](https://github.com/limelight-stream/limelight-pc). Also, a client for [Windows Phone 8.1](https://github.com/limelight-stream/limelight-wp) is in the works and actively being developed.
+In the meantime, check out the existing versions for [Android](https://github.com/limelight-stream/limelight-android) and [PC](https://github.com/limelight-stream/limelight-pc). Also, a client for [Windows and Windows Phone](https://github.com/limelight-stream/limelight-windows) is in the works and actively being developed.
 
 Please be patient as we work to bring Limelight to more platforms.

iPad.storyboard

@@ -0,0 +1,262 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="iOS.CocoaTouch.iPad" propertyAccessControl="none" initialViewController="EVd-wq-ego">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
+    </dependencies>
+    <customFonts key="customFonts">
+        <mutableArray key="Roboto-Regular.ttf">
+            <string>Roboto-Regular</string>
+        </mutableArray>
+    </customFonts>
+    <scenes>
+        <!--Main Frame View Controller-->
+        <scene sceneID="Me4-Nr-liz">
+            <objects>
+                <viewController id="wb7-af-jn8" customClass="MainFrameViewController" sceneMemberID="viewController">
+                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" indicatorStyle="black" dataMode="prototypes" id="TZj-Lc-M9d">
+                        <rect key="frame" x="0.0" y="0.0" width="1024" height="704"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <inset key="contentInset" minX="40" minY="20" maxX="40" maxY="20"/>
+                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="20" minimumInteritemSpacing="20" id="f7l-kG-hJc">
+                            <size key="itemSize" width="150" height="200"/>
+                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="20" minY="20" maxX="20" maxY="20"/>
+                        </collectionViewFlowLayout>
+                        <cells>
+                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="AppCell" id="fv6-NS-qsK">
+                                <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                    <rect key="frame" x="0.0" y="0.0" width="150" height="200"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                </view>
+                            </collectionViewCell>
+                        </cells>
+                        <connections>
+                            <outlet property="dataSource" destination="wb7-af-jn8" id="rXt-E0-FUz"/>
+                            <outlet property="delegate" destination="wb7-af-jn8" id="FKP-UO-cQM"/>
+                        </connections>
+                    </collectionView>
+                    <navigationItem key="navigationItem" id="pSu-bl-gL9">
+                        <barButtonItem key="leftBarButtonItem" style="done" id="mSL-ru-nRm">
+                            <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="Tiq-VS-Ua5">
+                                <rect key="frame" x="101" y="236" width="109" height="46"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="16"/>
+                                <state key="normal" title="Limelight" image="Logo">
+                                    <color key="titleColor" red="0.3921568627" green="0.91372549020000005" blue="0.17254901959999999" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                            </button>
+                        </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" title="No Host Selected" id="KDy-JC-2sU">
+                            <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        </barButtonItem>
+                    </navigationItem>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <connections>
+                        <outlet property="computerNameButton" destination="KDy-JC-2sU" id="Lkg-yz-GE6"/>
+                        <outlet property="limelightLogoButton" destination="Tiq-VS-Ua5" id="cue-NW-Hty"/>
+                        <segue destination="OIm-0n-i9v" kind="push" identifier="createStreamFrame" id="7gN-E7-Ips"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="ZYl-Xu-QyD" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="797" y="514"/>
+        </scene>
+        <!--Settings View Controller-->
+        <scene sceneID="tWo-uo-hHg">
+            <objects>
+                <viewController id="BsV-3c-455" customClass="SettingsViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="WRy-3f-gEP">
+                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bitrate: 10 Mbps" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="lMt-4H-fkV">
+                                <rect key="frame" x="16" y="39" width="151" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="20" minValue="1" maxValue="100" id="JAY-nj-UNz">
+                                <rect key="frame" x="14" y="68" width="213" height="31"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="tintColor" red="0.3921568627" green="0.91372549020000005" blue="0.17254901959999999" alpha="1" colorSpace="calibratedRGB"/>
+                            </slider>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Framerate" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Aiv-r8-9k2">
+                                <rect key="frame" x="16" y="106" width="79" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Resolution" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="pYZ-GR-EwO">
+                                <rect key="frame" x="16" y="171" width="82" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" id="ckc-Dm-8ex">
+                                <rect key="frame" x="16" y="200" width="209" height="29"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <segments>
+                                    <segment title="720p"/>
+                                    <segment title="1080p"/>
+                                    <segment title="Native"/>
+                                </segments>
+                                <color key="tintColor" red="0.3921568627" green="0.91372549020000005" blue="0.17254901959999999" alpha="1" colorSpace="calibratedRGB"/>
+                            </segmentedControl>
+                            <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" id="lGK-vl-pdw">
+                                <rect key="frame" x="16" y="135" width="209" height="29"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <segments>
+                                    <segment title="30 Hz"/>
+                                    <segment title="60 Hz"/>
+                                </segments>
+                                <color key="tintColor" red="0.3921568627" green="0.91372549020000005" blue="0.17254901959999999" alpha="1" colorSpace="calibratedRGB"/>
+                            </segmentedControl>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="On-Screen Controls" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="LGV-5y-piG">
+                                <rect key="frame" x="16" y="236" width="153" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" id="qSU-wh-tqA">
+                                <rect key="frame" x="16" y="265" width="209" height="29"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <segments>
+                                    <segment title="Off"/>
+                                    <segment title="Auto"/>
+                                    <segment title="Simple"/>
+                                    <segment title="Full"/>
+                                </segments>
+                                <color key="tintColor" red="0.3803921569" green="0.92156862750000001" blue="0.25882352939999997" alpha="1" colorSpace="calibratedRGB"/>
+                            </segmentedControl>
+                        </subviews>
+                        <color key="backgroundColor" cocoaTouchSystemColor="viewFlipsideBackgroundColor"/>
+                    </view>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <connections>
+                        <outlet property="bitrateLabel" destination="lMt-4H-fkV" id="ItM-l3-1Jk"/>
+                        <outlet property="bitrateSlider" destination="JAY-nj-UNz" id="fHd-v5-9Vo"/>
+                        <outlet property="framerateSelector" destination="lGK-vl-pdw" id="Kc8-Zv-hdm"/>
+                        <outlet property="onscreenControlSelector" destination="qSU-wh-tqA" id="j8d-fB-Z2c"/>
+                        <outlet property="resolutionSelector" destination="ckc-Dm-8ex" id="rl6-rx-wd3"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="01j-TU-OoL" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="779" y="1425"/>
+        </scene>
+        <!--Reveal View Controller-->
+        <scene sceneID="rR7-ZT-bc7">
+            <objects>
+                <viewController id="EVd-wq-ego" customClass="SWRevealViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="hGs-BR-t4b">
+                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <connections>
+                        <segue destination="baW-rW-rBd" kind="custom" identifier="sw_front" customClass="SWRevealViewControllerSegueSetController" id="RBe-eP-uG6"/>
+                        <segue destination="BsV-3c-455" kind="custom" identifier="sw_rear" customClass="SWRevealViewControllerSegueSetController" id="U4R-8o-x2S"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="lUU-kb-wrO" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-1728" y="514"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="FxL-or-HET">
+            <objects>
+                <navigationController id="baW-rW-rBd" sceneMemberID="viewController">
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="black" translucent="NO" id="RUe-14-4Ya">
+                        <rect key="frame" x="0.0" y="0.0" width="768" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="wb7-af-jn8" kind="relationship" relationship="rootViewController" id="nkY-JG-Wki"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="iLe-Yz-zIG" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-397" y="514"/>
+        </scene>
+        <!--Stream Frame View Controller-->
+        <scene sceneID="RuD-qk-7nb">
+            <objects>
+                <viewController storyboardIdentifier="MainFrame" id="OIm-0n-i9v" customClass="StreamFrameViewController" sceneMemberID="viewController">
+                    <view key="view" multipleTouchEnabled="YES" contentMode="scaleToFill" id="VPm-Ae-rc4" userLabel="RenderView" customClass="StreamView">
+                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <activityIndicatorView opaque="NO" clearsContextBeforeDrawing="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="white" id="iOs-1X-mSU">
+                                <rect key="frame" x="502" y="374" width="20" height="20"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </activityIndicatorView>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="dDs-kT-po6">
+                                <rect key="frame" x="491" y="402" width="42" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                        </subviews>
+                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="iUf-9X-GeA"/>
+                    <nil key="simulatedStatusBarMetrics"/>
+                    <nil key="simulatedTopBarMetrics"/>
+                    <nil key="simulatedBottomBarMetrics"/>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <simulatedScreenMetrics key="simulatedDestinationMetrics"/>
+                    <connections>
+                        <outlet property="spinner" destination="iOs-1X-mSU" id="LSl-lr-7fF"/>
+                        <outlet property="stageLabel" destination="dDs-kT-po6" id="ziI-M8-UVf"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="hON-k2-Efa" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1946" y="514"/>
+        </scene>
+        <!--Loading Frame View Controller-->
+        <scene sceneID="lcG-48-utf">
+            <objects>
+                <viewController storyboardIdentifier="loadingFrame" modalTransitionStyle="crossDissolve" modalPresentationStyle="overCurrentContext" id="ZNo-L5-uxh" customClass="LoadingFrameViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="le1-tU-NEp">
+                        <rect key="frame" x="0.0" y="0.0" width="1024" height="768"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" id="N0D-dj-EuF">
+                                <rect key="frame" x="494" y="365" width="37" height="37"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                            </activityIndicatorView>
+                        </subviews>
+                        <color key="backgroundColor" white="0.0" alpha="0.5" colorSpace="calibratedWhite"/>
+                    </view>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <connections>
+                        <outlet property="loadingSpinner" destination="N0D-dj-EuF" id="xEQ-nx-SOt"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="lJG-tq-Jrs" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1946" y="1425"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="Logo" width="36" height="36"/>
+    </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar" statusBarStyle="lightContent"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination"/>
+    </simulatedMetricsContainer>
+</document>

iPhone.storyboard

@@ -0,0 +1,264 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="6254" systemVersion="14C109" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" initialViewController="DL0-L5-LOv">
+    <dependencies>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="6247"/>
+    </dependencies>
+    <customFonts key="customFonts">
+        <mutableArray key="Roboto-Regular.ttf">
+            <string>Roboto-Regular</string>
+        </mutableArray>
+    </customFonts>
+    <scenes>
+        <!--Main Frame View Controller-->
+        <scene sceneID="emz-kO-L7q">
+            <objects>
+                <viewController id="dgh-JZ-Q7z" customClass="MainFrameViewController" sceneMemberID="viewController">
+                    <collectionView key="view" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="scaleToFill" indicatorStyle="black" dataMode="prototypes" id="Rtu-AT-Alw">
+                        <rect key="frame" x="0.0" y="0.0" width="568" height="256"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <inset key="contentInset" minX="40" minY="20" maxX="40" maxY="20"/>
+                        <collectionViewFlowLayout key="collectionViewLayout" minimumLineSpacing="20" minimumInteritemSpacing="20" id="YcZ-cR-3tK">
+                            <size key="itemSize" width="90" height="120"/>
+                            <size key="headerReferenceSize" width="0.0" height="0.0"/>
+                            <size key="footerReferenceSize" width="0.0" height="0.0"/>
+                            <inset key="sectionInset" minX="20" minY="20" maxX="20" maxY="20"/>
+                        </collectionViewFlowLayout>
+                        <cells>
+                            <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" reuseIdentifier="AppCell" id="Uqv-Di-fzX">
+                                <rect key="frame" x="0.0" y="0.0" width="50" height="50"/>
+                                <autoresizingMask key="autoresizingMask"/>
+                                <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
+                                    <rect key="frame" x="0.0" y="0.0" width="90" height="120"/>
+                                    <autoresizingMask key="autoresizingMask"/>
+                                    <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="calibratedWhite"/>
+                                </view>
+                            </collectionViewCell>
+                        </cells>
+                        <connections>
+                            <outlet property="dataSource" destination="dgh-JZ-Q7z" id="w0a-4o-Htw"/>
+                            <outlet property="delegate" destination="dgh-JZ-Q7z" id="Fn8-LA-OLu"/>
+                        </connections>
+                    </collectionView>
+                    <toolbarItems/>
+                    <navigationItem key="navigationItem" id="1jn-Sf-Xky">
+                        <barButtonItem key="leftBarButtonItem" style="done" id="zAn-CM-7Yz">
+                            <button key="customView" opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" lineBreakMode="middleTruncation" id="pZ9-ft-T24">
+                                <rect key="frame" x="0.0" y="0.0" width="109" height="46"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" name="Roboto-Regular" family="Roboto" pointSize="16"/>
+                                <state key="normal" title="Limelight" image="Logo">
+                                    <color key="titleColor" red="0.3921568627" green="0.91372549020000005" blue="0.17254901959999999" alpha="1" colorSpace="calibratedRGB"/>
+                                    <color key="titleShadowColor" white="0.5" alpha="1" colorSpace="calibratedWhite"/>
+                                </state>
+                            </button>
+                        </barButtonItem>
+                        <barButtonItem key="rightBarButtonItem" title="No Host Selected" id="L1H-n4-HB7">
+                            <color key="tintColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                        </barButtonItem>
+                    </navigationItem>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <connections>
+                        <outlet property="computerNameButton" destination="L1H-n4-HB7" id="bng-Ky-oQs"/>
+                        <outlet property="limelightLogoButton" destination="pZ9-ft-T24" id="yRw-rK-9lQ"/>
+                        <segue destination="mI3-9F-XwU" kind="push" identifier="createStreamFrame" id="Vgc-B6-lvM"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="HNf-lX-GEO" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1363" y="796"/>
+        </scene>
+        <!--Reveal View Controller-->
+        <scene sceneID="QYt-XN-Ojr">
+            <objects>
+                <viewController id="DL0-L5-LOv" customClass="SWRevealViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="Usg-e0-g4a">
+                        <rect key="frame" x="0.0" y="0.0" width="568" height="320"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <connections>
+                        <segue destination="rYd-e6-cQU" kind="custom" identifier="sw_rear" customClass="SWRevealViewControllerSegueSetController" id="vBQ-bn-yZu"/>
+                        <segue destination="ftZ-kC-fxI" kind="custom" identifier="sw_front" customClass="SWRevealViewControllerSegueSetController" id="V3E-d5-bsZ"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="RXm-iV-Zqb" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="-66" y="796"/>
+        </scene>
+        <!--Side Bar-->
+        <scene sceneID="uYM-56-Ivb">
+            <objects>
+                <viewController id="rYd-e6-cQU" userLabel="Side Bar" customClass="SettingsViewController" sceneMemberID="viewController">
+                    <view key="view" contentMode="scaleToFill" id="iNk-qF-gIr" customClass="UIScrollView">
+                        <rect key="frame" x="0.0" y="0.0" width="568" height="320"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <slider opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" value="20" minValue="1" maxValue="100" id="3nn-MI-9Xu">
+                                <rect key="frame" x="14" y="49" width="204" height="31"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <color key="tintColor" red="0.39215686274509803" green="0.9137254901960784" blue="0.17254901960784313" alpha="1" colorSpace="calibratedRGB"/>
+                            </slider>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Bitrate: 10 Mbps" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="SBv-Wn-LB7">
+                                <rect key="frame" x="16" y="20" width="151" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" id="dLF-qJ-2nY">
+                                <rect key="frame" x="16" y="116" width="200" height="29"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <segments>
+                                    <segment title="30 Hz"/>
+                                    <segment title="60 Hz"/>
+                                </segments>
+                                <color key="tintColor" red="0.39215686274509803" green="0.9137254901960784" blue="0.17254901960784313" alpha="1" colorSpace="calibratedRGB"/>
+                            </segmentedControl>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Framerate" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="Kkv-DF-MAl">
+                                <rect key="frame" x="16" y="87" width="79" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Resolution" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="8zy-ri-Dqc">
+                                <rect key="frame" x="16" y="152" width="82" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="0" id="PCM-t4-Sha">
+                                <rect key="frame" x="16" y="181" width="200" height="29"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <segments>
+                                    <segment title="720p"/>
+                                    <segment title="1080p"/>
+                                    <segment title="Native"/>
+                                </segments>
+                                <color key="tintColor" red="0.39215686274509803" green="0.9137254901960784" blue="0.17254901960784313" alpha="1" colorSpace="calibratedRGB"/>
+                            </segmentedControl>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="On-Screen Controls" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="HZT-dd-DuQ">
+                                <rect key="frame" x="16" y="217" width="153" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <segmentedControl opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="left" contentVerticalAlignment="top" segmentControlStyle="plain" selectedSegmentIndex="1" id="WGf-9d-eAm">
+                                <rect key="frame" x="16" y="246" width="200" height="29"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <segments>
+                                    <segment title="Off"/>
+                                    <segment title="Auto"/>
+                                    <segment title="Simple"/>
+                                    <segment title="Full"/>
+                                </segments>
+                                <color key="tintColor" red="0.38039215686274508" green="0.92156862745098034" blue="0.25882352941176467" alpha="1" colorSpace="calibratedRGB"/>
+                            </segmentedControl>
+                        </subviews>
+                        <color key="backgroundColor" cocoaTouchSystemColor="viewFlipsideBackgroundColor"/>
+                    </view>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <connections>
+                        <outlet property="bitrateLabel" destination="SBv-Wn-LB7" id="Wdu-me-Bvd"/>
+                        <outlet property="bitrateSlider" destination="3nn-MI-9Xu" id="IuD-Rk-vPp"/>
+                        <outlet property="framerateSelector" destination="dLF-qJ-2nY" id="hE3-hk-iwa"/>
+                        <outlet property="onscreenControlSelector" destination="WGf-9d-eAm" id="hob-se-4Sn"/>
+                        <outlet property="resolutionSelector" destination="PCM-t4-Sha" id="t60-W2-wkV"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="RWc-Km-KG5" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="1363" y="1266"/>
+        </scene>
+        <!--Navigation Controller-->
+        <scene sceneID="pfX-8A-htT">
+            <objects>
+                <navigationController id="ftZ-kC-fxI" sceneMemberID="viewController">
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <navigationBar key="navigationBar" contentMode="scaleToFill" barStyle="black" translucent="NO" id="0ZA-Ec-QgD">
+                        <rect key="frame" x="0.0" y="0.0" width="320" height="44"/>
+                        <autoresizingMask key="autoresizingMask"/>
+                        <textAttributes key="titleTextAttributes">
+                            <offsetWrapper key="textShadowOffset" horizontal="0.0" vertical="0.0"/>
+                        </textAttributes>
+                    </navigationBar>
+                    <connections>
+                        <segue destination="dgh-JZ-Q7z" kind="relationship" relationship="rootViewController" id="NhF-R8-8s3"/>
+                    </connections>
+                </navigationController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="Dr2-S8-dHh" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="660" y="796"/>
+        </scene>
+        <!--Stream Frame View Controller-->
+        <scene sceneID="5Eb-q2-vjt">
+            <objects>
+                <viewController id="mI3-9F-XwU" customClass="StreamFrameViewController" sceneMemberID="viewController">
+                    <view key="view" multipleTouchEnabled="YES" contentMode="scaleToFill" id="eir-e9-IPE" customClass="StreamView">
+                        <rect key="frame" x="0.0" y="0.0" width="568" height="320"/>
+                        <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                        <subviews>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Stage" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="2HK-Z5-4Ch">
+                                <rect key="frame" x="262" y="149" width="45" height="21"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
+                                <fontDescription key="fontDescription" type="system" pointSize="17"/>
+                                <color key="textColor" red="1" green="1" blue="1" alpha="1" colorSpace="custom" customColorSpace="calibratedRGB"/>
+                                <nil key="highlightedColor"/>
+                            </label>
+                            <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" hidesWhenStopped="YES" animating="YES" style="white" id="0vm-Iv-K4b">
+                                <rect key="frame" x="274" y="121" width="20" height="20"/>
+                                <autoresizingMask key="autoresizingMask" flexibleMinX="YES" flexibleMaxX="YES" flexibleMinY="YES" flexibleMaxY="YES"/>
+                            </activityIndicatorView>
+                        </subviews>
+                        <color key="backgroundColor" white="0.0" alpha="1" colorSpace="calibratedWhite"/>
+                    </view>
+                    <navigationItem key="navigationItem" id="8uX-4T-BiC"/>
+                    <nil key="simulatedStatusBarMetrics"/>
+                    <nil key="simulatedTopBarMetrics"/>
+                    <nil key="simulatedBottomBarMetrics"/>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <connections>
+                        <outlet property="spinner" destination="0vm-Iv-K4b" id="Lif-zG-6Jh"/>
+                        <outlet property="stageLabel" destination="2HK-Z5-4Ch" id="1bI-Ig-OpD"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="pqv-jd-33O" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2092" y="796"/>
+        </scene>
+        <!--Loading Frame View Controller-->
+        <scene sceneID="kPF-XD-S77">
+            <objects>
+                <viewController storyboardIdentifier="loadingFrame" modalTransitionStyle="crossDissolve" modalPresentationStyle="overCurrentContext" id="9W0-2D-0Kp" customClass="LoadingFrameViewController" sceneMemberID="viewController">
+                    <view key="view" opaque="NO" clearsContextBeforeDrawing="NO" contentMode="center" id="nSw-dc-mi4">
+                        <rect key="frame" x="0.0" y="0.0" width="568" height="320"/>
+                        <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
+                        <subviews>
+                            <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" animating="YES" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="oNu-Gu-QeM">
+                                <rect key="frame" x="266" y="141" width="37" height="37"/>
+                            </activityIndicatorView>
+                        </subviews>
+                        <color key="backgroundColor" white="0.0" alpha="0.5" colorSpace="calibratedWhite"/>
+                    </view>
+                    <simulatedOrientationMetrics key="simulatedOrientationMetrics" orientation="landscapeRight"/>
+                    <connections>
+                        <outlet property="loadingSpinner" destination="oNu-Gu-QeM" id="5IK-qn-mIZ"/>
+                    </connections>
+                </viewController>
+                <placeholder placeholderIdentifier="IBFirstResponder" id="GaV-PK-JSI" userLabel="First Responder" sceneMemberID="firstResponder"/>
+            </objects>
+            <point key="canvasLocation" x="2104" y="1266"/>
+        </scene>
+    </scenes>
+    <resources>
+        <image name="Logo" width="36" height="36"/>
+    </resources>
+    <simulatedMetricsContainer key="defaultSimulatedMetrics">
+        <simulatedStatusBarMetrics key="statusBar"/>
+        <simulatedOrientationMetrics key="orientation"/>
+        <simulatedScreenMetrics key="destination" type="retina4"/>
+    </simulatedMetricsContainer>
+</document>