now show loading frame when waiting for background tasks

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

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 */; };
@@ -31,6 +38,7 @@
 		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 */; };
@@ -51,7 +59,15 @@
 		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 */; };
-		FBD3494319FC9C04002D2A60 /* AppManager.m in Sources */ = {isa = PBXBuildFile; fileRef = FBD3494219FC9C04002D2A60 /* AppManager.m */; };
+		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 */; };
@@ -88,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; };
@@ -118,8 +141,11 @@
 		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>"; };
@@ -232,8 +258,24 @@
 		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>"; };
-		FBD3494119FC9C04002D2A60 /* AppManager.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = AppManager.h; sourceTree = "<group>"; };
-		FBD3494219FC9C04002D2A60 /* AppManager.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = AppManager.m; 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>"; };
@@ -295,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 = (
@@ -336,6 +400,7 @@
 		FB290CF919B2C406004C83CF /* Limelight */ = {
 			isa = PBXGroup;
 			children = (
+				9E5D5FF61A5A5A3900689918 /* Font */,
 				FB89460419F646E200339C8A /* Crypto */,
 				FB89460919F646E200339C8A /* Input */,
 				FB89460E19F646E200339C8A /* Network */,
@@ -346,15 +411,15 @@
 				FB290CFA19B2C406004C83CF /* Supporting Files */,
 				FB290D0219B2C406004C83CF /* AppDelegate.h */,
 				FB290D0319B2C406004C83CF /* AppDelegate.m */,
+				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 */,
-				FBDE86DE19F7A837001C18A8 /* UIComputerView.h */,
-				FBDE86DF19F7A837001C18A8 /* UIComputerView.m */,
-				FBDE86E419F82297001C18A8 /* UIAppView.h */,
-				FBDE86E519F82297001C18A8 /* UIAppView.m */,
 			);
 			path = Limelight;
 			sourceTree = "<group>";
@@ -404,6 +469,8 @@
 			children = (
 				FB89460A19F646E200339C8A /* ControllerSupport.h */,
 				FB89460B19F646E200339C8A /* ControllerSupport.m */,
+				FB9AFD411A7F0C6900872C98 /* Controller.h */,
+				FB9AFD421A7F0C6900872C98 /* Controller.m */,
 				FB89460C19F646E200339C8A /* StreamView.h */,
 				FB89460D19F646E200339C8A /* StreamView.m */,
 				FB4678EB1A50C40900377732 /* OnScreenControls.h */,
@@ -415,20 +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 */,
-				FBD3494119FC9C04002D2A60 /* AppManager.h */,
-				FBD3494219FC9C04002D2A60 /* AppManager.m */,
 				FB4678FD1A565DAC00377732 /* WakeOnLanManager.h */,
 				FB4678FE1A565DAC00377732 /* WakeOnLanManager.m */,
-				FB4678F81A55FFAD00377732 /* DiscoveryManager.h */,
-				FB4678F91A55FFAD00377732 /* DiscoveryManager.m */,
-				FB6549541A57907E001C8F39 /* DiscoveryWorker.h */,
-				FB6549551A57907E001C8F39 /* DiscoveryWorker.m */,
 			);
 			path = Network;
 			sourceTree = "<group>";
@@ -455,6 +515,8 @@
 				FBDE86E819F82315001C18A8 /* App.m */,
 				FB89462119F646E200339C8A /* Utils.h */,
 				FB89462219F646E200339C8A /* Utils.m */,
+				FBD1C8E01A8AD69E00C6703C /* Logger.h */,
+				FBD1C8E11A8AD71400C6703C /* Logger.m */,
 			);
 			path = Utility;
 			sourceTree = "<group>";
@@ -470,6 +532,8 @@
 				FB89462719F646E200339C8A /* StreamFrameViewController.m */,
 				FBD3494E19FF2174002D2A60 /* SettingsViewController.h */,
 				FBD3494F19FF2174002D2A60 /* SettingsViewController.m */,
+				FB4A23B61A9D3637004D2EF2 /* LoadingFrameViewController.h */,
+				FB4A23B71A9D3637004D2EF2 /* LoadingFrameViewController.m */,
 			);
 			path = ViewControllers;
 			sourceTree = "<group>";
@@ -635,6 +699,49 @@
 			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 = (
@@ -744,10 +851,17 @@
 			buildActionMask = 2147483647;
 			files = (
 				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 /* 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;
 		};
@@ -770,11 +884,14 @@
 				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 */,
 				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 */,
@@ -786,15 +903,21 @@
 				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 */,
-				FBD3494319FC9C04002D2A60 /* AppManager.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;
@@ -1049,10 +1172,11 @@
 		FB290D0519B2C406004C83CF /* Limelight.xcdatamodeld */ = {
 			isa = XCVersionGroup;
 			children = (
+				FB6549621A60B4A9001C8F39 /* Limelight 0.3.1.xcdatamodel */,
 				FB4678F21A51BDCB00377732 /* Limelight 0.3.0.xcdatamodel */,
 				FB290D0619B2C406004C83CF /* Limelight.xcdatamodel */,
 			);
-			currentVersion = FB4678F21A51BDCB00377732 /* Limelight 0.3.0.xcdatamodel */;
+			currentVersion = FB6549621A60B4A9001C8F39 /* Limelight 0.3.1.xcdatamodel */;
 			path = Limelight.xcdatamodeld;
 			sourceTree = "<group>";
 			versionGroupType = wrapper.xcdatamodel;

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();
         } 
     }
@@ -131,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();
     }    
     

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.m

@@ -19,6 +19,7 @@
 - (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];
@@ -26,7 +27,7 @@
 
     NSError* error;
     if (![[self.appDelegate managedObjectContext] save:&error]) {
-        NSLog(@"ERROR: Unable to save settings to database");
+        Log(LOG_E, @"Unable to save settings to database: %@", error);
     }
     [self.appDelegate saveContext];
 }
@@ -58,7 +59,7 @@
 - (void) saveHosts {
     NSError* error;
     if (![[self.appDelegate managedObjectContext] save:&error]) {
-        NSLog(@"ERROR: Unable to save hosts to database");
+        Log(LOG_E, @"Unable to save hosts to database: %@", error);
     }
     [self.appDelegate saveContext];
 }

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/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" : "Icon-Small@3x.png"
+    },
+    {
+      "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" : "Icon-40@3x.png"
+    },
+    {
+      "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" : "Icon-76@2x.png"
     }
   ],
   "info" : {
     "version" : 1,
-    "author" : "xcode"
+    "author" : "makeappicon"
   }
 }

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/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/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/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) {
-            NSLog(@"Controller connected!");
-            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) {
-        NSLog(@"Controller disconnected!");
+        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

@@ -8,18 +8,25 @@
 
 #import <Foundation/Foundation.h>
 
+@class ControllerSupport;
+
 @interface OnScreenControls : NSObject
 
 typedef NS_ENUM(NSInteger, OnScreenControlsLevel) {
     OnScreenControlsLevelOff,
+    OnScreenControlsLevelAuto,
     OnScreenControlsLevelSimple,
-    OnScreenControlsLevelFull
+    OnScreenControlsLevelFull,
+    
+    // Internal levels selected by ControllerSupport
+    OnScreenControlsLevelAutoGCGamepad,
+    OnScreenControlsLevelAutoGCExtendedGamepad,
 };
 
-- (id) initWithView:(UIView*)view;
-- (BOOL) handleTouchDownEvent:(UIEvent*)event;
-- (BOOL) handleTouchUpEvent:(UIEvent*) event;
-- (BOOL) handleTouchMovedEvent:(UIEvent*)event;
+- (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

@@ -7,6 +7,8 @@
 //
 
 #import "OnScreenControls.h"
+#import "ControllerSupport.h"
+#import "Controller.h"
 #include "Limelight.h"
 
 #define UPDATE_BUTTON(x, y) (buttonFlags = \
@@ -29,13 +31,10 @@
     CALayer* _selectButton;
     CALayer* _r1Button;
     CALayer* _r2Button;
+    CALayer* _r3Button;
     CALayer* _l1Button;
     CALayer* _l2Button;
-
-    short buttonFlags;
-    short leftStickX, leftStickY;
-    short rightStickX, rightStickY;
-    char leftTrigger, rightTrigger;
+    CALayer* _l3Button;
     
     UITouch* _aTouch;
     UITouch* _bTouch;
@@ -51,11 +50,22 @@
     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;
@@ -69,6 +79,7 @@ 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;
@@ -87,45 +98,29 @@ static const float SELECT_HEIGHT = 30;
 static float SELECT_X;
 static float SELECT_Y;
 
-static const float BUMPER_SIZE = 70;
-static const float TRIGGER_SIZE = 80;
+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 {
+- (id) initWithView:(UIView*)view controllerSup:(ControllerSupport*)controllerSupport {
     self = [self init];
     _view = view;
-    
-    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;
+    _controllerSupport = controllerSupport;
+    _controller = [[Controller alloc] init];
+    _controller.playerIndex = 0;
     
     _aButton = [CALayer layer];
     _bButton = [CALayer layer];
@@ -139,6 +134,8 @@ static float L2_Y;
     _r1Button = [CALayer layer];
     _l2Button = [CALayer layer];
     _r2Button = [CALayer layer];
+    _l3Button = [CALayer layer];
+    _r3Button = [CALayer layer];
     _startButton = [CALayer layer];
     _selectButton = [CALayer layer];
     _leftStickBackground = [CALayer layer];
@@ -162,24 +159,120 @@ static float L2_Y;
             [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 hideButtons];
             [self hideBumpers];
             [self hideSticks];
+            [self hideL3R3];
             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;
@@ -264,7 +357,6 @@ static float L2_Y;
     _leftStickBackground.contents = (id) [UIImage imageNamed:@"StickOuter"].CGImage;
     [_view.layer addSublayer:_leftStickBackground];
     
-    _leftStick = [CALayer layer];
     _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];
@@ -274,12 +366,25 @@ static float L2_Y;
     _rightStickBackground.contents = (id) [UIImage imageNamed:@"StickOuter"].CGImage;
     [_view.layer addSublayer:_rightStickBackground];
     
-    _rightStick = [CALayer layer];
     _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];
@@ -313,8 +418,13 @@ static float L2_Y;
     [_rightStick removeFromSuperlayer];
 }
 
-- (BOOL) handleTouchMovedEvent:(UIEvent*)event {
-    BOOL shouldSendPacket = false;
+- (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;
@@ -325,7 +435,7 @@ static float L2_Y;
     float lsMinX = LS_CENTER_X - STICK_OUTER_SIZE / 2;
     float lsMinY = LS_CENTER_Y - STICK_OUTER_SIZE / 2;
 
-    for (UITouch* touch in [event allTouches]) {
+    for (UITouch* touch in touches) {
         CGPoint touchLocation = [touch locationInView:_view];
         float xLoc = touchLocation.x;
         float yLoc = touchLocation.y;
@@ -343,10 +453,9 @@ static float L2_Y;
             if (fabsf(xStickVal) < STICK_DEAD_ZONE) xStickVal = 0;
             if (fabsf(yStickVal) < STICK_DEAD_ZONE) yStickVal = 0;
 
-            leftStickX = 0x7FFE * xStickVal;
-            leftStickY = 0x7FFE * -yStickVal;
+            [_controllerSupport updateLeftStick:_controller x:0x7FFE * xStickVal y:0x7FFE * -yStickVal];
 
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _rsTouch) {
             if (xLoc > rsMaxX) xLoc = rsMaxX;
             if (xLoc < rsMinX) xLoc = rsMinX;
@@ -361,10 +470,9 @@ static float L2_Y;
             if (fabsf(xStickVal) < STICK_DEAD_ZONE) xStickVal = 0;
             if (fabsf(yStickVal) < STICK_DEAD_ZONE) yStickVal = 0;
 
-            rightStickX = 0x7FFE * xStickVal;
-            rightStickY = 0x7FFE * -yStickVal;
+            [_controllerSupport updateRightStick:_controller x:0x7FFE * xStickVal y:0x7FFE * -yStickVal];
 
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _aTouch) {
             buttonTouch = true;
         } else if (touch == _bTouch) {
@@ -393,169 +501,222 @@ static float L2_Y;
             buttonTouch = true;
         } else if (touch == _r2Touch) {
             buttonTouch = true;
+        } else if (touch == _l3Touch) {
+            buttonTouch = true;
+        } else if (touch == _r3Touch) {
+            buttonTouch = true;
         }
     }
-    if (shouldSendPacket) {
-        LiSendControllerEvent(buttonFlags, leftTrigger, rightTrigger,
-                          leftStickX, leftStickY, rightStickX, rightStickY);
+    if (updated) {
+        [_controllerSupport updateFinished:_controller];
     }
-    return shouldSendPacket || buttonTouch;
+    return updated || buttonTouch;
 }
 
-- (BOOL)handleTouchDownEvent:(UIEvent*)event {
-    BOOL shouldSendPacket = false;
-    for (UITouch* touch in [event allTouches]) {
+- (BOOL)handleTouchDownEvent:touches {
+    BOOL updated = false;
+    BOOL stickTouch = false;
+    for (UITouch* touch in touches) {
         CGPoint touchLocation = [touch locationInView:_view];
 
         if ([_aButton.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(A_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:A_FLAG];
             _aTouch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_bButton.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(B_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:B_FLAG];
             _bTouch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_xButton.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(X_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:X_FLAG];
             _xTouch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_yButton.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(Y_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:Y_FLAG];
             _yTouch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_upButton.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(UP_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:UP_FLAG];
             _upTouch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_downButton.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(DOWN_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:DOWN_FLAG];
             _downTouch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_leftButton.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(LEFT_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:LEFT_FLAG];
             _leftTouch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_rightButton.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(RIGHT_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:RIGHT_FLAG];
             _rightTouch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_startButton.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(PLAY_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:PLAY_FLAG];
             _startTouch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_selectButton.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(BACK_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:BACK_FLAG];
             _selectTouch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_l1Button.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(LB_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:LB_FLAG];
             _l1Touch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_r1Button.presentationLayer hitTest:touchLocation]) {
-            UPDATE_BUTTON(RB_FLAG, 1);
+            [_controllerSupport setButtonFlag:_controller flags:RB_FLAG];
             _r1Touch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_l2Button.presentationLayer hitTest:touchLocation]) {
-            leftTrigger = 1 * 0xFF;
+            [_controllerSupport updateLeftTrigger:_controller left:0xFF];
             _l2Touch = touch;
-            shouldSendPacket = true;
+            updated = true;
         } else if ([_r2Button.presentationLayer hitTest:touchLocation]) {
-            rightTrigger = 1 * 0xFF;
+            [_controllerSupport updateRightTrigger:_controller right:0xFF];
             _r2Touch = touch;
-            shouldSendPacket = true;
+            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;
-            shouldSendPacket = true;
+            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;
-            shouldSendPacket = true;
+            stickTouch = true;
         }
     }
-    if (shouldSendPacket) {
-        LiSendControllerEvent(buttonFlags, leftTrigger, rightTrigger,
-                              leftStickX, leftStickY, rightStickX, rightStickY);
+    if (updated) {
+        [_controllerSupport updateFinished:_controller];
     }
-    return shouldSendPacket;
+    return updated || stickTouch;
 }
 
-- (BOOL)handleTouchUpEvent:(UIEvent*)event {
-    BOOL shouldSendPacket = false;
-    for (UITouch* touch in [event allTouches]) {
+- (BOOL)handleTouchUpEvent:touches {
+    BOOL updated = false;
+    BOOL touched = false;
+    for (UITouch* touch in touches) {
         if (touch == _aTouch) {
-            UPDATE_BUTTON(A_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:A_FLAG];
             _aTouch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _bTouch) {
-            UPDATE_BUTTON(B_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:B_FLAG];
             _bTouch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _xTouch) {
-            UPDATE_BUTTON(X_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:X_FLAG];
             _xTouch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _yTouch) {
-            UPDATE_BUTTON(Y_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:Y_FLAG];
             _yTouch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _upTouch) {
-            UPDATE_BUTTON(UP_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:UP_FLAG];
             _upTouch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _downTouch) {
-            UPDATE_BUTTON(DOWN_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:DOWN_FLAG];
             _downTouch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _leftTouch) {
-            UPDATE_BUTTON(LEFT_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:LEFT_FLAG];
             _leftTouch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _rightTouch) {
-            UPDATE_BUTTON(RIGHT_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:RIGHT_FLAG];
             _rightTouch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _startTouch) {
-            UPDATE_BUTTON(PLAY_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:PLAY_FLAG];
             _startTouch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _selectTouch) {
-            UPDATE_BUTTON(BACK_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:BACK_FLAG];
             _selectTouch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _l1Touch) {
-            UPDATE_BUTTON(LB_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:LB_FLAG];
             _l1Touch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _r1Touch) {
-            UPDATE_BUTTON(RB_FLAG, 0);
+            [_controllerSupport clearButtonFlag:_controller flags:RB_FLAG];
             _r1Touch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _l2Touch) {
-            leftTrigger = 0 * 0xFF;
+            [_controllerSupport updateLeftTrigger:_controller left:0];
             _l2Touch = nil;
-            shouldSendPacket = true;
+            updated = true;
         } else if (touch == _r2Touch) {
-            rightTrigger = 0 * 0xFF;
+            [_controllerSupport updateRightTrigger:_controller right:0];
             _r2Touch = nil;
-            shouldSendPacket = true;
+            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);
-            leftStickX = 0 * 0x7FFE;
-            leftStickY = 0 * 0x7FFE;
-            shouldSendPacket = true;
+            [_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);
-            rightStickX = 0 * 0x7FFE;
-            rightStickY = 0 * 0x7FFE;
+            [_controllerSupport updateRightStick:_controller x:0 y:0];
+            [_controllerSupport clearButtonFlag:_controller flags:RS_CLK_FLAG];
+            r3TouchStart = [NSDate date];
             _rsTouch = nil;
-            shouldSendPacket = true;
+            updated = true;
+        }
+        else if (touch == _l3Touch) {
+            _l3Touch = nil;
+            touched = true;
+        }
+        else if (touch == _r3Touch) {
+            _r3Touch = nil;
+            touched = true;
         }
     }
-    if (shouldSendPacket) {
-        LiSendControllerEvent(buttonFlags, leftTrigger, rightTrigger,
-                              leftStickX, leftStickY, rightStickX, rightStickY);
+    if (updated) {
+        [_controllerSupport updateFinished:_controller];
     }
-    return  shouldSendPacket;
+    return updated || touched;
 }
 
 @end

Limelight/Input/StreamView.h

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

Limelight/Input/StreamView.m

@@ -10,24 +10,42 @@
 #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) setupOnScreenControls {
-    onScreenControls = [[OnScreenControls alloc] initWithView:self];
+- (void) setMouseDeltaFactors:(float)x y:(float)y {
+    xDeltaFactor = x;
+    yDeltaFactor = y;
+    
+    screenFactor = [[UIScreen mainScreen] scale];
+}
+
+- (void) setupOnScreenControls:(ControllerSupport*)controllerSupport {
+    onScreenControls = [[OnScreenControls alloc] initWithView:self controllerSup:controllerSupport];
     DataManager* dataMan = [[DataManager alloc] init];
     OnScreenControlsLevel level = (OnScreenControlsLevel)[[dataMan retrieveSettings].onscreenControls integerValue];
-    NSLog(@"Setting on-screen controls level: %d", (int)level);
-    [onScreenControls setLevel:level];
+    
+    if (level == OnScreenControlsLevelAuto) {
+        [controllerSupport initAutoOnScreenControlMode:onScreenControls];
+    }
+    else {
+        Log(LOG_I, @"Setting manual on-screen controls level: %d", (int)level);
+        [onScreenControls setLevel:level];
+    }
 }
 
 - (void)touchesBegan:(NSSet *)touches withEvent:(UIEvent *)event {
-    NSLog(@"Touch down");
-    if (![onScreenControls handleTouchDownEvent:event]) {
+    Log(LOG_D, @"Touch down");
+    if (![onScreenControls handleTouchDownEvent:touches]) {
         UITouch *touch = [[event allTouches] anyObject];
         touchLocation = [touch locationInView:self];
         touchMoved = false;
@@ -35,7 +53,7 @@
 }
 
 - (void)touchesMoved:(NSSet *)touches withEvent:(UIEvent *)event {
-    if (![onScreenControls handleTouchMovedEvent:event]) {
+    if (![onScreenControls handleTouchMovedEvent:touches]) {
         if ([[event allTouches] count] == 1) {
             UITouch *touch = [[event allTouches] anyObject];
             CGPoint currentLocation = [touch locationInView:self];
@@ -43,8 +61,13 @@
             if (touchLocation.x != currentLocation.x ||
                 touchLocation.y != currentLocation.y)
             {
-                LiSendMouseMoveEvent(currentLocation.x - touchLocation.x,
-                                     currentLocation.y - touchLocation.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;
@@ -65,11 +88,11 @@
 }
 
 - (void)touchesEnded:(NSSet *)touches withEvent:(UIEvent *)event {
-    NSLog(@"Touch up");
-    if (![onScreenControls handleTouchUpEvent:event]) {
+    Log(LOG_D, @"Touch up");
+    if (![onScreenControls handleTouchUpEvent:touches]) {
         if (!touchMoved) {
             if ([[event allTouches] count]  == 2) {
-                NSLog(@"Sending right mouse button press");
+                Log(LOG_D, @"Sending right mouse button press");
 
                 LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, BUTTON_RIGHT);
 
@@ -80,7 +103,7 @@
 
 
             } else {
-                NSLog(@"Sending left mouse button press");
+                Log(LOG_D, @"Sending left mouse button press");
 
                 LiSendMouseButtonEvent(BUTTON_ACTION_PRESS, 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.3.0</string>
+	<string>0.3.2</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -26,6 +26,15 @@
 	<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>

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 0.3.0.xcdatamodel</string>
+	<string>Limelight 0.3.1.xcdatamodel</string>
 </dict>
 </plist>

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

@@ -18,6 +18,6 @@
     </entity>
     <elements>
         <element name="Host" positionX="0" positionY="0" width="128" height="148"/>
-        <element name="Settings" positionX="0" positionY="0" width="128" height="118"/>
+        <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/Network/AppAssetManager.h

@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "App.h"
 #import "HttpManager.h"
+#import "Host.h"
 
 @protocol AppAssetCallback <NSObject>
 
@@ -16,8 +17,10 @@
 
 @end
 
-@interface AppManager : NSObject
+@interface AppAssetManager : NSObject
 
-+ (void) retrieveAppAssets:(NSArray*)apps withManager:(HttpManager*)hMan andCallback:(id<AppAssetCallback>)callback;
+- (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/AppManager.m

@@ -1,45 +0,0 @@
-//
-//  AppManager.m
-//  Limelight
-//
-//  Created by Diego Waxemberg on 10/25/14.
-//  Copyright (c) 2014 Limelight Stream. All rights reserved.
-//
-
-#import "AppManager.h"
-
-@implementation AppManager {
-    App* _app;
-    HttpManager* _hMan;
-    id<AppAssetCallback> _callback;
-}
-
-+ (void) retrieveAppAssets:(NSArray*)apps withManager:(HttpManager*)hMan andCallback:(id<AppAssetCallback>)callback {
-    for (App* app in apps) {
-        AppManager* manager = [[AppManager alloc] initWithApp:app httpManager:hMan andCallback:callback];
-        [manager retrieveAsset];
-    }
-    
-}
-
-- (id) initWithApp:(App*)app httpManager:(HttpManager*)hMan andCallback:(id<AppAssetCallback>)callback {
-    self = [super init];
-    _app = app;
-    _hMan = hMan;
-    _callback = callback;
-    return self;
-}
-
-- (void) retrieveAsset {
-    NSData* appAsset = [_hMan executeRequestSynchronously:[_hMan newAppAssetRequestWithAppId:_app.appId]];
-    UIImage* appImage = [UIImage imageWithData:appAsset];
-    _app.appImage = appImage;
-    NSLog(@"App Name: %@ id:%@ image: %@", _app.appName, _app.appId, _app.appImage);
-    [self performSelectorOnMainThread:@selector(sendCallBack) withObject:self waitUntilDone:NO];
-}
-
-- (void) sendCallBack {
-    [_callback receivedAssetForApp:_app];
-}
-
-@end

Limelight/Network/DiscoveryManager.h

@@ -24,6 +24,6 @@
 - (void) stopDiscoveryBlocking;
 - (BOOL) addHostToDiscovery:(Host*)host;
 - (void) removeHostFromDiscovery:(Host*)host;
-- (void) discoverHost:(NSString*)hostAddress withCallback:(void (^)(Host*))callback;
+- (void) discoverHost:(NSString*)hostAddress withCallback:(void (^)(Host*, NSString*))callback;
 
 @end

Limelight/Network/DiscoveryManager.m

@@ -12,6 +12,7 @@
 #import "Utils.h"
 #import "DataManager.h"
 #import "DiscoveryWorker.h"
+#import "ServerInfoResponse.h"
 
 @implementation DiscoveryManager {
     NSMutableArray* _hostQueue;
@@ -37,25 +38,32 @@
     return self;
 }
 
-- (void) discoverHost:(NSString *)hostAddress withCallback:(void (^)(Host *))callback {
+- (void) discoverHost:(NSString *)hostAddress withCallback:(void (^)(Host *, NSString*))callback {
     HttpManager* hMan = [[HttpManager alloc] initWithHost:hostAddress uniqueId:_uniqueId deviceName:deviceName cert:_cert];
-    NSData* serverInfoData = [hMan executeRequestSynchronously:[hMan newServerInfoRequest]];
+    ServerInfoResponse* serverInfoResponse = [[ServerInfoResponse alloc] init];
+    [hMan executeRequestSynchronously:[HttpRequest requestForResponse:serverInfoResponse withUrlRequest:[hMan newServerInfoRequest]]];
     
     Host* host = nil;
-    if ([[HttpManager getStatusStringFromXML:serverInfoData] isEqualToString:@"OK"]) {
+    if ([serverInfoResponse isStatusOk]) {
         DataManager* dataMan = [[DataManager alloc] init];
         host = [dataMan createHost];
         host.address = hostAddress;
-        [DiscoveryWorker updateHost:host withServerInfo:serverInfoData];
+        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");
     }
-    callback(host);
+    
 }
 
 - (void) startDiscovery {
-    NSLog(@"Starting discovery");
+    Log(LOG_I, @"Starting discovery");
     shouldDiscover = YES;
     [_mdnsMan searchForHosts];
     for (Host* host in _hostQueue) {
@@ -64,19 +72,19 @@
 }
 
 - (void) stopDiscovery {
-    NSLog(@"Stopping discovery");
+    Log(LOG_I, @"Stopping discovery");
     shouldDiscover = NO;
     [_mdnsMan stopSearching];
     [_opQueue cancelAllOperations];
 }
 
 - (void) stopDiscoveryBlocking {
-    NSLog(@"Stopping discovery and waiting for workers to stop");
+    Log(LOG_I, @"Stopping discovery and waiting for workers to stop");
     shouldDiscover = NO;
     [_mdnsMan stopSearching];
     [_opQueue cancelAllOperations];
     [_opQueue waitUntilAllOperationsAreFinished];
-    NSLog(@"All discovery workers stopped");
+    Log(LOG_I, @"All discovery workers stopped");
 }
 
 - (BOOL) addHostToDiscovery:(Host *)host {
@@ -105,12 +113,15 @@
         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
-            NSOperation* worker = [self createWorkerForHost:host];
-            [worker main];
+            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];
             }
         }

Limelight/Network/DiscoveryWorker.h

@@ -12,8 +12,7 @@
 @interface DiscoveryWorker : NSOperation
 
 - (id) initWithHost:(Host*)host uniqueId:(NSString*)uniqueId cert:(NSData*)cert;
+- (void) discoverHost;
 - (Host*) getHost;
 
-+ (void) updateHost:(Host*)host withServerInfo:(NSData*)serverInfoData;
-
 @end

Limelight/Network/DiscoveryWorker.m

@@ -9,6 +9,8 @@
 #import "DiscoveryWorker.h"
 #import "Utils.h"
 #import "HttpManager.h"
+#import "ServerInfoResponse.h"
+#import "HttpRequest.h"
 
 @implementation DiscoveryWorker {
     Host* _host;
@@ -32,59 +34,55 @@ static const float POLL_RATE = 2.0f; // Poll every 2 seconds
 
 - (void)main {
     while (!self.cancelled) {
-        BOOL receivedResponse = NO;
-        if (!self.cancelled && _host.localAddress != nil) {
-            HttpManager* hMan = [[HttpManager alloc] initWithHost:_host.localAddress uniqueId:_uniqueId deviceName:deviceName cert:_cert];
-            NSData* serverInfoData = [hMan executeRequestSynchronously:[hMan newServerInfoRequest]];
-            if ([[HttpManager getStatusStringFromXML:serverInfoData] isEqualToString:@"OK"]) {
-                [DiscoveryWorker updateHost:_host withServerInfo:serverInfoData];
-                _host.address = _host.localAddress;
-                receivedResponse = YES;
-            }
-        }
-        if (!self.cancelled && !receivedResponse && _host.externalAddress != nil) {
-            HttpManager* hMan = [[HttpManager alloc] initWithHost:_host.externalAddress uniqueId:_uniqueId deviceName:deviceName cert:_cert];
-            NSData* serverInfoData = [hMan executeRequestSynchronously:[hMan newServerInfoRequest]];
-            if ([[HttpManager getStatusStringFromXML:serverInfoData] isEqualToString:@"OK"]) {
-                [DiscoveryWorker updateHost:_host withServerInfo:serverInfoData];
-                _host.address = _host.externalAddress;
-                receivedResponse = YES;
-            }
-        }
-        
-        if (!self.cancelled && !receivedResponse && _host.address != nil) {
-            HttpManager* hMan = [[HttpManager alloc] initWithHost:_host.address uniqueId:_uniqueId deviceName:deviceName cert:_cert];
-            NSData* serverInfoData = [hMan executeRequestSynchronously:[hMan newServerInfoRequest]];
-            if ([[HttpManager getStatusStringFromXML:serverInfoData] isEqualToString:@"OK"]) {
-                [DiscoveryWorker updateHost:_host withServerInfo:serverInfoData];
-                receivedResponse = YES;
-            }
-        }
-        _host.online = receivedResponse;
-        if (receivedResponse) {
-            NSLog(@"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);
-        } else {
-            // If the host is not online, we do not know the pairstate
-            _host.pairState = PairStateUnknown;
-        }
+        [self discoverHost];
         if (!self.cancelled) {
             [NSThread sleepForTimeInterval:POLL_RATE];
         }
     }
 }
 
-+ (void) updateHost:(Host*)host withServerInfo:(NSData*)serverInfoData {
-    host.name = [HttpManager getStringFromXML:serverInfoData tag:@"hostname"];
-    host.externalAddress = [HttpManager getStringFromXML:serverInfoData tag:@"ExternalIP"];
-    host.localAddress = [HttpManager getStringFromXML:serverInfoData tag:@"LocalIP"];
-    host.uuid = [HttpManager getStringFromXML:serverInfoData tag:@"uniqueid"];
-    host.mac = [HttpManager getStringFromXML:serverInfoData tag:@"mac"];
-    NSString* pairState = [HttpManager getStringFromXML:serverInfoData tag:@"PairStatus"];
-    if ([pairState isEqualToString:@"1"]) {
-        host.pairState = PairStatePaired;
-    } else {
-        host.pairState = PairStateUnpaired;
+- (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