From: Mika Laitio Date: Wed, 5 Oct 2011 19:44:35 +0000 (+0300) Subject: initial version X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=8e99118324c8e97d7477f40c7fa86ad7771b019c;p=vdr-tv-client.git initial version --- 8e99118324c8e97d7477f40c7fa86ad7771b019c diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..9a19f04 --- /dev/null +++ b/.gitignore @@ -0,0 +1,22 @@ +*~ +*.o +*.la +*.lo +*.so +*.pc +.*.swp +Makefile* +vdr-client +*.pro.user +moc_* +gen_* +*_adaptor.* +*_interface.* +.gen +.moc +.obj +*.tar.bz2 +.qm +.ts +vdr-client.qm +vdr-client.ts diff --git a/AUTHORS b/AUTHORS new file mode 100644 index 0000000..8616e7e --- /dev/null +++ b/AUTHORS @@ -0,0 +1,3 @@ +Original Author: +Mika Laitio + diff --git a/ChangeLog b/ChangeLog new file mode 100644 index 0000000..652934c --- /dev/null +++ b/ChangeLog @@ -0,0 +1,2 @@ +* Wed Oct 5 2011 Mika Laitio - 0.1 +- initial version tested with N900 MeeGo CE 1.2 version diff --git a/LICENSE b/LICENSE new file mode 100644 index 0000000..f90922e --- /dev/null +++ b/LICENSE @@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + Everyone is permitted to copy and distribute verbatim copies + of this license document, but changing it is not allowed. + + Preamble + + The licenses for most software are designed to take away your +freedom to share and change it. By contrast, the GNU General Public +License is intended to guarantee your freedom to share and change free +software--to make sure the software is free for all its users. This +General Public License applies to most of the Free Software +Foundation's software and to any other program whose authors commit to +using it. (Some other Free Software Foundation software is covered by +the GNU Lesser General Public License instead.) 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 +this service 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 make restrictions that forbid +anyone to deny you these rights or to ask you to surrender the rights. +These restrictions translate to certain responsibilities for you if you +distribute copies of the software, or if you modify it. + + For example, if you distribute copies of such a program, whether +gratis or for a fee, you must give the recipients all the rights that +you have. 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. + + We protect your rights with two steps: (1) copyright the software, and +(2) offer you this license which gives you legal permission to copy, +distribute and/or modify the software. + + Also, for each author's protection and ours, we want to make certain +that everyone understands that there is no warranty for this free +software. If the software is modified by someone else and passed on, we +want its recipients to know that what they have is not the original, so +that any problems introduced by others will not reflect on the original +authors' reputations. + + Finally, any free program is threatened constantly by software +patents. We wish to avoid the danger that redistributors of a free +program will individually obtain patent licenses, in effect making the +program proprietary. To prevent this, we have made it clear that any +patent must be licensed for everyone's free use or not licensed at all. + + The precise terms and conditions for copying, distribution and +modification follow. + + GNU GENERAL PUBLIC LICENSE + TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION + + 0. This License applies to any program or other work which contains +a notice placed by the copyright holder saying it may be distributed +under the terms of this General Public License. The "Program", below, +refers to any such program or work, and a "work based on the Program" +means either the Program or any derivative work under copyright law: +that is to say, a work containing the Program or a portion of it, +either verbatim or with modifications and/or translated into another +language. (Hereinafter, translation is included without limitation in +the term "modification".) Each licensee is addressed as "you". + +Activities other than copying, distribution and modification are not +covered by this License; they are outside its scope. The act of +running the Program is not restricted, and the output from the Program +is covered only if its contents constitute a work based on the +Program (independent of having been made by running the Program). +Whether that is true depends on what the Program does. + + 1. You may copy and distribute 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 and disclaimer of warranty; keep intact all the +notices that refer to this License and to the absence of any warranty; +and give any other recipients of the Program a copy of this License +along with the Program. + +You may charge a fee for the physical act of transferring a copy, and +you may at your option offer warranty protection in exchange for a fee. + + 2. You may modify your copy or copies of the Program or any portion +of it, thus forming a work based on the Program, and copy and +distribute such modifications or work under the terms of Section 1 +above, provided that you also meet all of these conditions: + + a) You must cause the modified files to carry prominent notices + stating that you changed the files and the date of any change. + + b) You must cause any work that you distribute or publish, that in + whole or in part contains or is derived from the Program or any + part thereof, to be licensed as a whole at no charge to all third + parties under the terms of this License. + + c) If the modified program normally reads commands interactively + when run, you must cause it, when started running for such + interactive use in the most ordinary way, to print or display an + announcement including an appropriate copyright notice and a + notice that there is no warranty (or else, saying that you provide + a warranty) and that users may redistribute the program under + these conditions, and telling the user how to view a copy of this + License. (Exception: if the Program itself is interactive but + does not normally print such an announcement, your work based on + the Program is not required to print an announcement.) + +These requirements apply to the modified work as a whole. If +identifiable sections of that work are not derived from the Program, +and can be reasonably considered independent and separate works in +themselves, then this License, and its terms, do not apply to those +sections when you distribute them as separate works. But when you +distribute the same sections as part of a whole which is a work based +on the Program, the distribution of the whole must be on the terms of +this License, whose permissions for other licensees extend to the +entire whole, and thus to each and every part regardless of who wrote it. + +Thus, it is not the intent of this section to claim rights or contest +your rights to work written entirely by you; rather, the intent is to +exercise the right to control the distribution of derivative or +collective works based on the Program. + +In addition, mere aggregation of another work not based on the Program +with the Program (or with a work based on the Program) on a volume of +a storage or distribution medium does not bring the other work under +the scope of this License. + + 3. You may copy and distribute the Program (or a work based on it, +under Section 2) in object code or executable form under the terms of +Sections 1 and 2 above provided that you also do one of the following: + + a) Accompany it with the complete corresponding machine-readable + source code, which must be distributed under the terms of Sections + 1 and 2 above on a medium customarily used for software interchange; or, + + b) Accompany it with a written offer, valid for at least three + years, to give any third party, for a charge no more than your + cost of physically performing source distribution, a complete + machine-readable copy of the corresponding source code, to be + distributed under the terms of Sections 1 and 2 above on a medium + customarily used for software interchange; or, + + c) Accompany it with the information you received as to the offer + to distribute corresponding source code. (This alternative is + allowed only for noncommercial distribution and only if you + received the program in object code or executable form with such + an offer, in accord with Subsection b above.) + +The source code for a work means the preferred form of the work for +making modifications to it. For an executable work, complete source +code means all the source code for all modules it contains, plus any +associated interface definition files, plus the scripts used to +control compilation and installation of the executable. However, as a +special exception, the source code distributed need not include +anything that is normally distributed (in either source or binary +form) with the major components (compiler, kernel, and so on) of the +operating system on which the executable runs, unless that component +itself accompanies the executable. + +If distribution of executable or object code is made by offering +access to copy from a designated place, then offering equivalent +access to copy the source code from the same place counts as +distribution of the source code, even though third parties are not +compelled to copy the source along with the object code. + + 4. You may not copy, modify, sublicense, or distribute the Program +except as expressly provided under this License. Any attempt +otherwise to copy, modify, sublicense or distribute the Program is +void, and will automatically terminate your rights under this License. +However, parties who have received copies, or rights, from you under +this License will not have their licenses terminated so long as such +parties remain in full compliance. + + 5. You are not required to accept this License, since you have not +signed it. However, nothing else grants you permission to modify or +distribute the Program or its derivative works. These actions are +prohibited by law if you do not accept this License. Therefore, by +modifying or distributing the Program (or any work based on the +Program), you indicate your acceptance of this License to do so, and +all its terms and conditions for copying, distributing or modifying +the Program or works based on it. + + 6. Each time you redistribute the Program (or any work based on the +Program), the recipient automatically receives a license from the +original licensor to copy, distribute or modify the Program subject to +these terms and conditions. You may not impose any further +restrictions on the recipients' exercise of the rights granted herein. +You are not responsible for enforcing compliance by third parties to +this License. + + 7. If, as a consequence of a court judgment or allegation of patent +infringement or for any other reason (not limited to patent issues), +conditions are imposed on you (whether by court order, agreement or +otherwise) that contradict the conditions of this License, they do not +excuse you from the conditions of this License. If you cannot +distribute so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you +may not distribute the Program at all. For example, if a patent +license would not permit royalty-free redistribution of the Program by +all those who receive copies directly or indirectly through you, then +the only way you could satisfy both it and this License would be to +refrain entirely from distribution of the Program. + +If any portion of this section is held invalid or unenforceable under +any particular circumstance, the balance of the section is intended to +apply and the section as a whole is intended to apply in other +circumstances. + +It is not the purpose of this section to induce you to infringe any +patents or other property right claims or to contest validity of any +such claims; this section has the sole purpose of protecting the +integrity of the free software distribution system, which is +implemented by public license practices. Many people have made +generous contributions to the wide range of software distributed +through that system in reliance on consistent application of that +system; it is up to the author/donor to decide if he or she is willing +to distribute software through any other system and a licensee cannot +impose that choice. + +This section is intended to make thoroughly clear what is believed to +be a consequence of the rest of this License. + + 8. If the distribution and/or use of the Program is restricted in +certain countries either by patents or by copyrighted interfaces, the +original copyright holder who places the Program under this License +may add an explicit geographical distribution limitation excluding +those countries, so that distribution is permitted only in or among +countries not thus excluded. In such case, this License incorporates +the limitation as if written in the body of this License. + + 9. The Free Software Foundation may publish revised and/or new versions +of the 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 a version number of this License which applies to it and "any +later version", you have the option of following the terms and conditions +either of that version or of any later version published by the Free +Software Foundation. If the Program does not specify a version number of +this License, you may choose any version ever published by the Free Software +Foundation. + + 10. If you wish to incorporate parts of the Program into other free +programs whose distribution conditions are different, write to the author +to ask for permission. For software which is copyrighted by the Free +Software Foundation, write to the Free Software Foundation; we sometimes +make exceptions for this. Our decision will be guided by the two goals +of preserving the free status of all derivatives of our free software and +of promoting the sharing and reuse of software generally. + + NO WARRANTY + + 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, 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. + + 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR +REDISTRIBUTE THE 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. + + 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 +convey the exclusion of warranty; and each file should have at least +the "copyright" line and a pointer to where the full notice is found. + + + Copyright (C) + + 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 2 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, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + + +Also add information on how to contact you by electronic and paper mail. + +If the program is interactive, make it output a short notice like this +when it starts in an interactive mode: + + Gnomovision version 69, Copyright (C) year name of author + Gnomovision 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, the commands you use may +be called something other than `show w' and `show c'; they could even be +mouse-clicks or menu items--whatever suits your program. + +You should also get your employer (if you work as a programmer) or your +school, if any, to sign a "copyright disclaimer" for the program, if +necessary. Here is a sample; alter the names: + + Yoyodyne, Inc., hereby disclaims all copyright interest in the program + `Gnomovision' (which makes passes at compilers) written by James Hacker. + + , 1 April 1989 + Ty Coon, President of Vice + +This 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. diff --git a/README b/README new file mode 100644 index 0000000..ddb8bd8 --- /dev/null +++ b/README @@ -0,0 +1,27 @@ +vdr-tv-client is a front-end for watching the tv with meego devices. +It's been tested with N900 CE 1.2 version. + +Installation guide: + +1) Install VDR server with xineliboutout plug-in to server + - vdr server: version 1.7.21 from git://projects.vdr-developer.org/vdr.git + - vdr-xineliboutput plug-in: git://projects.vdr-developer.org/xineliboutput.git (tested with git rev: 8fa1c508) + - vdr-server config: "-P'xineliboutput --local=none --remote=37890" + - plugins/xineliboutput/allowed_hosts.conf +2) Install Meego 1.2 CE edition for N900 (Tested by running meego from the sd card on N900) + - http://wiki.meego.com/ARM/N900 +3) Install urw-fonts and ghostscript-fonts packages manually (zypper has problems for finding packages from noarch repositories) + # wget -c http://repo.meego.com/MeeGo/builds/1.2.0.90/1.2.0.90.12.20110809.2/repos/oss/armv7hl/packages/noarch/urw-fonts-2.4-10.4.noarch.rpm + # wget -c http://repo.meego.com/MeeGo/builds/1.2.0.90/1.2.0.90.12.20110809.2/repos/oss/armv7hl/packages/noarch/ghostscript-fonts-6.0-21.4.noarch.rpm + # rpm -Uvh urw-fonts-2.4-10.4.noarch.rpm ghostscript-fonts-6.0-21.4.noarch.rpm +4) Add vdr-repository from the N900 console + # zypper ar http://repo.pub.meego.com/home:/lamikr:/vdr/MeeGo_Trunk_standard vdr +5) Install vdr-tv-client + # zypper install vdr-tv-client +6) Connect N900/Meego to network where you have vdr +7) Launch vdr-tv-client from the icon +8) Enter vdr-server address and press enter + - "xvdr+tcp://192.168.2.1:37890" for example +--> vdr-tv-client will launch /usr/bin/vdr-sxfe with given server address parameter +--> If problems, try to launch vdr-sxfe manually from the console + diff --git a/TODO b/TODO new file mode 100644 index 0000000..b4fdc95 --- /dev/null +++ b/TODO @@ -0,0 +1,3 @@ +- embed the xine-lib ui directly to vdr-tv-client instead of launching vdr-xineliboutput separately +- store the vdr-server address +- extend the vdr-xineliboutput server to pack the video for the mobile client resolution diff --git a/common.pri b/common.pri new file mode 100644 index 0000000..45bb664 --- /dev/null +++ b/common.pri @@ -0,0 +1,14 @@ +load(meegotouch_defines) +VERSION = legacy +TARGET = vdr-tv-client +CONFIG += link_pkgconfig meegotouch debug +PKGCONFIG += QtNetwork QtOpenGL + +# Build configuration + +QMAKE_CXXFLAGS += -g + +# Features +DEFINES += DBUS_SERVICE_PATH=\\\"/com/meego/${QMAKE_TARGET}\\\" +DEFINES += DBUS_SERVICE=\\\"com.meego.${QMAKE_TARGET}\\\" + diff --git a/projects.pro b/projects.pro new file mode 100644 index 0000000..0d2b106 --- /dev/null +++ b/projects.pro @@ -0,0 +1,23 @@ +include (common.pri) +TEMPLATE = subdirs +CONFIG += ordered +SUBDIRS = src qml themes translations + +OTHER_FILES += *.desktop + +# desktop launcher +desktop_entry.files = vdr-tv-client.desktop +desktop_entry.path = $$M_INSTALL_DATA/applications +desktop_entry.CONFIG += no_check_exist + +application_icon.files = themes/base/icons/meego-app-vdr-tv-client.png +application_icon.path = $$M_INSTALL_DATA/pixmaps +application_icon.CONFIG += no_check_exist + +# docs +documentation.files = AUTHORS ChangeLog LICENSE README TODO +documentation.path = $$INSTALL_ROOT/usr/share/vdr-tv-client/ + +INSTALLS += \ + desktop_entry \ + documentation diff --git a/qml/qml.pro b/qml/qml.pro new file mode 100644 index 0000000..b3b79ee --- /dev/null +++ b/qml/qml.pro @@ -0,0 +1,7 @@ +TEMPLATE = subdirs +CONFIG += ordered + +qml.files = vdr-tv-client +qml.path = $${installPrefix}/usr/share/ + +INSTALLS += qml diff --git a/qml/vdr-tv-client/qml/ServerSelectionEntry.qml b/qml/vdr-tv-client/qml/ServerSelectionEntry.qml new file mode 100644 index 0000000..551f5fb --- /dev/null +++ b/qml/vdr-tv-client/qml/ServerSelectionEntry.qml @@ -0,0 +1,112 @@ +/* + * vdr-tv-client: TV frontend for watching tv streams from the vdr server. + * + * Copyright (c) 2011, Mika Laitio. + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + */ + +import Qt 4.7 +import com.nokia.meego 1.0 +import com.meego.vdrclient 1.0 + +Item { + property string locTxt_CaptionServerSelection: qsTr("Enter VDR server address:") + property string locTxt_BtnRestoreDefault: qsTr("Restore Default Address") + property string locTxt_BtnConnect: qsTr("Watch VDR TV") + property string defaultVDRServerAddress: "xvdr+tcp://192.168.2.1:37890" + property TextInput textInput: editVDRServerSelectionAddress + id: cmp + VDRClient { id: adapter } // callback to QMLVDRClient c++ class + + function restoreDefaultVDRServerAddress() { + editVDRServerSelectionAddress.color = "red"; + editVDRServerSelectionAddress.text = defaultVDRServerAddress; + } + + function connectVDRServer() { + if (editVDRServerSelectionAddress.text.length > 5) { + adapter.launch_viewer(editVDRServerSelectionAddress.text); + } + } + + Text { + font.pointSize: 24 + anchors {top: parent.top; left: parent.left; margins: 10} + text: locTxt_CaptionServerSelection + id: captionServerSelection + } + + TextInput { + id: editVDRServerSelectionAddress + anchors {top: captionServerSelection.bottom; left: parent.left; right: parent.right; margins: 10} + color: style.foregroundLight + cursorVisible: true + //activeFocusOnPress: true + inputMethodHints: Qt.ImhDialableCharactersOnly + font {pixelSize: 36} + text: defaultVDRServerAddress + //focus: true + + onTextChanged: { + if (text.length == 0) { + cmp.restoreDefaultVDRServerAddress(); + } + if (text == defaultVDRServerAddress) { + color = "red"; + } + else { + color = "black"; + } + } + onAccepted: { + if (text.length > 5) { + cmp.connectVDRServer(text) + } + } + } + + Button { + id: btnRestoreDefault + anchors {top: editVDRServerSelectionAddress.bottom; left: parent.left; margins: 24} + text: locTxt_BtnRestoreDefault + + MouseArea { + anchors.fill: parent + onClicked: { + if (editVDRServerSelectionAddress.text != defaultVDRServerAddress) { + cmp.restoreDefaultVDRServerAddress(); + } + } + } + } + + Button { + id: btnConnect + anchors {top: editVDRServerSelectionAddress.bottom; right: parent.right; margins: 24} + text: locTxt_BtnConnect + + MouseArea { + anchors.fill: parent + onClicked: { + if (editVDRServerSelectionAddress.text.length > 5) { + cmp.connectVDRServer(editVDRServerSelectionAddress.text); + } + } + } + } +} diff --git a/qml/vdr-tv-client/qml/ServerSelectionMain.qml b/qml/vdr-tv-client/qml/ServerSelectionMain.qml new file mode 100644 index 0000000..0d3f635 --- /dev/null +++ b/qml/vdr-tv-client/qml/ServerSelectionMain.qml @@ -0,0 +1,32 @@ +/* + * vdr-tv-client: TV frontend for watching tv streams from the vdr server. + * + * Copyright (c) 2011, Mika Laitio. + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + */ + +import Qt 4.7 +import com.nokia.meego 1.0 + +PageStackWindow { + id: appWindow + initialPage: serverSelectionPage + ServerSelectionPage { + id: serverSelectionPage + } +} diff --git a/qml/vdr-tv-client/qml/ServerSelectionPage.qml b/qml/vdr-tv-client/qml/ServerSelectionPage.qml new file mode 100644 index 0000000..97dc314 --- /dev/null +++ b/qml/vdr-tv-client/qml/ServerSelectionPage.qml @@ -0,0 +1,37 @@ +/* + * vdr-tv-client: TV frontend for watching tv streams from the vdr server. + * + * Copyright (c) 2011, Mika Laitio. + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + */ + +import Qt 4.7 +import com.nokia.meego 1.0 + +Page { + id: serverSelectionPage + + ServerSelectionEntry { + id: serverSelectionEntry + anchors { + top: parent.top; bottom: parent.bottom; + left: parent.left; right: parent.right + margins: 10 + } + } +} diff --git a/src/QMLMainWindow.cpp b/src/QMLMainWindow.cpp new file mode 100644 index 0000000..8d44e4e --- /dev/null +++ b/src/QMLMainWindow.cpp @@ -0,0 +1,57 @@ +/* + * vdr-tv-client: TV frontend for watching tv streams from the vdr server. + * + * Copyright (c) 2011, Mika Laitio. + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + */ + +#include "QMLVDRClient.h" +#include "QMLMainWindow.h" +#include + +QMLMainWindow::QMLMainWindow() +{ + qmlRegisterType("com.meego.vdrclient", 1, 0, "VDRClient"); + + view = new QDeclarativeView; + context = view->rootContext(); + context->setContextProperty("backgroundColor", + QColor(Qt::yellow)); + + view->setSource(QUrl::fromLocalFile("/usr/share/vdr-tv-client/qml/ServerSelectionMain.qml")); + view->show(); +} + +QMLMainWindow::~QMLMainWindow() +{ + delete(view); +} + +QMLMainWindow* QMLMainWindow::instance() +{ + static QMLMainWindow *_instance = NULL; + + qCritical() << "1"; + if(_instance == NULL) + { + _instance = new QMLMainWindow; + } + qCritical() << "2"; + + return _instance; +} diff --git a/src/QMLMainWindow.h b/src/QMLMainWindow.h new file mode 100644 index 0000000..33e7f8f --- /dev/null +++ b/src/QMLMainWindow.h @@ -0,0 +1,47 @@ +/* + * vdr-tv-client: TV frontend for watching tv streams from the vdr server. + * + * Copyright (c) 2011, Mika Laitio. + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + */ + +#ifndef QMLMAINWINDOW_H +#define QMLMAINWINDOW_H + +#include +#include +#include +#include +#include +#include + +#include "QMLVDRClient.h" + +class QMLMainWindow +{ + public: + static QMLMainWindow* instance(); + ~QMLMainWindow(); + + private: + explicit QMLMainWindow(); + QDeclarativeView *view; + QDeclarativeContext *context; +}; + +#endif // QMLMAINWINDOW_H diff --git a/src/QMLVDRClient.cpp b/src/QMLVDRClient.cpp new file mode 100644 index 0000000..5571c9a --- /dev/null +++ b/src/QMLVDRClient.cpp @@ -0,0 +1,52 @@ +/* + * vdr-tv-client: TV frontend for watching tv streams from the vdr server. + * + * Copyright (c) 2011, Mika Laitio. + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + */ + +#include "QMLVDRClient.h" +#include + +class QMLVDRClientPrivate { + public: + QMLVDRClientPrivate(){} +}; + +QMLVDRClient::QMLVDRClient(QObject *parent) : QObject(parent), priva(new QMLVDRClientPrivate) { +} + +QMLVDRClient::~QMLVDRClient() { + delete this->priva; +} + +void QMLVDRClient::launch_viewer(const QString &server_address) { + QTextStream out(stdout); + + out << "vdr server address for client launch: " << server_address << endl; + QString program = "/usr/bin/vdr-sxfe"; + QStringList arguments; + //arguments << "-style" << "motif"; + arguments << server_address; + QProcess *myProcess = new QProcess(this); + out << "calling start" << endl; + myProcess->start(program, arguments); + out << "wait for finished" << endl; + myProcess->waitForFinished(); + out << "wait for finished done" << endl; +} diff --git a/src/QMLVDRClient.h b/src/QMLVDRClient.h new file mode 100644 index 0000000..e49a82c --- /dev/null +++ b/src/QMLVDRClient.h @@ -0,0 +1,43 @@ +/* + * vdr-tv-client: TV frontend for watching tv streams from the vdr server. + * + * Copyright (c) 2011, Mika Laitio. + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + */ + +#ifndef QMLVDRCLIENT_H +#define QMLVDRCLIENT_H + +#include + +class QMLVDRClient : public QObject +{ + Q_OBJECT + + public: + explicit QMLVDRClient(QObject *parent = 0); + ~QMLVDRClient(); + + public Q_SLOTS: + void launch_viewer(const QString &server_address); + + private: + class QMLVDRClientPrivate *priva; +}; + +#endif // QMLVDRCLIENT_H diff --git a/src/main.cpp b/src/main.cpp new file mode 100644 index 0000000..abbcf60 --- /dev/null +++ b/src/main.cpp @@ -0,0 +1,42 @@ +/* + * vdr-tv-client: TV frontend for watching tv streams from the vdr server. + * + * Copyright (c) 2011, Mika Laitio. + * + * 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 2 + * 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, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA + * Or, point your browser to http://www.gnu.org/copyleft/gpl.html + * + */ + +#include +#include +#include +#include +#include +#include + +#include "QMLVDRClient.h" +#include "QMLMainWindow.h" + +int main(int argc, char *argv[]) { + QApplication app(argc, argv); + + QMLMainWindow *m; + + QMLMainWindow::instance(); + + return app.exec(); +} + diff --git a/src/src.pro b/src/src.pro new file mode 100644 index 0000000..4ce0749 --- /dev/null +++ b/src/src.pro @@ -0,0 +1,31 @@ +include (../common.pri) +TEMPLATE = app +QT += opengl declarative +CONFIG += mobility link_pkgconfig +PKGCONFIG += QtNetwork +#PKGCONFIG += libresourceqt1 libpulse-mainloop-glib +MOBILITY += multimedia +MOC_DIR = .moc +OBJECTS_DIR = .obj +MGEN_OUTDIR = .gen + +INCLUDEPATH += /var/tmp/build-root/usr/include + +target.path = $$M_INSTALL_BIN + +SOURCES += main.cpp \ + QMLVDRClient.cpp \ + QMLMainWindow.cpp + +HEADERS += \ + QMLVDRClient.h \ + QMLMainWindow.h + +MAKE_CLEAN += $$OBJECTS_DIR/*.o +MAKE_DISTCLEAN += \ + $$MOC_DIR/* $$MOC_DIR \ + $$OBJECTS_DIR/* $$OBJECTS_DIR \ + $$MGEN_OUTDIR/* $$MGEN_OUTDIR \ + +# install +INSTALLS += target diff --git a/themes/base/base.pro b/themes/base/base.pro new file mode 100644 index 0000000..1a3a40b --- /dev/null +++ b/themes/base/base.pro @@ -0,0 +1,19 @@ +load(meegotouch_defines) +include (../../common.pri) +TEMPLATE = subdirs +THEME_NAME = $$system(basename $$PWD) + +# Icon files +desktop_icon.files = ./icons/meego-app-vdr-tv-client.png +desktop_icon.path = $$M_INSTALL_DATA/pixmaps +desktop_icon.CONFIG += no_check_exist + +# Theme files +theme.files = $$system(find ./* -type d) +theme.files += dialer.conf +theme.path = $$M_THEME_DIR/$$THEME_NAME/meegotouch/$$TARGET/ +theme.CONFIG += no_check_exist + +INSTALLS += \ + desktop_icon \ + theme diff --git a/themes/base/icons/meego-app-vdr-tv-client.png b/themes/base/icons/meego-app-vdr-tv-client.png new file mode 100755 index 0000000..bfc303c Binary files /dev/null and b/themes/base/icons/meego-app-vdr-tv-client.png differ diff --git a/themes/themes.pro b/themes/themes.pro new file mode 100644 index 0000000..3ec4034 --- /dev/null +++ b/themes/themes.pro @@ -0,0 +1,3 @@ +TEMPLATE = subdirs +CONFIG += ordered +SUBDIRS = $$system(find * -type d -prune) diff --git a/translations/translations.pro b/translations/translations.pro new file mode 100644 index 0000000..cea637c --- /dev/null +++ b/translations/translations.pro @@ -0,0 +1,14 @@ +include (../common.pri) +DISABLE_QTTRID_ENGINEERING_ENGLISH=no +LANGUAGES = # We only create engineering English in the application package +CATALOGNAME = $$TARGET +SOURCEDIR = ../src/ ../qml/ +TRANSLATIONDIR = . + +# Fix for BMC# 9282 +# The following line will disable the prepending of Engineering English +# to all qtTrId wrapped strings by short circuiting the test for +# isEmpty(LRELEASE_OPTIONS) in meegotouch_translations.prf. +LRELEASE_OPTIONS = -idbased + +load(meegotouch_translations) diff --git a/vdr-tv-client.desktop b/vdr-tv-client.desktop new file mode 100644 index 0000000..0eed47b --- /dev/null +++ b/vdr-tv-client.desktop @@ -0,0 +1,7 @@ +[Desktop Entry] +Type=Application +Name=VDR-TV Client +Icon=meego-app-vdr-tv-client +Exec=vdr-tv-client +Comment=TV Client frontend for connecting to VDR Server +X-Desktop-File-Install-Version=0.1 diff --git a/vdr-tv-client.yaml b/vdr-tv-client.yaml new file mode 100644 index 0000000..d103294 --- /dev/null +++ b/vdr-tv-client.yaml @@ -0,0 +1,33 @@ +Name: vdr-tv-client +Summary: TV frontend for watching TV from the VDR server. +Version: 0.1 +Release: 1 +Group: System/GUI/Other +License: GPL, Version 2.0 +URL: http://www.pilppa.org +Sources: + - "%{name}-%{version}.tar.bz2" +Description: QML based %{Summary} +PkgConfigBR: + - QtOpenGL + - meegotouch + - QtDeclarative +Provides: + - vdr-tv-client +Requires: + - vdr-xineliboutput +UseAsNeeded: false +Builder: qmake +Files: +- "%{_bindir}/%{name}" +- "%{_datadir}/pixmaps/meego-app-vdr-tv-client.png" +- "%{_datadir}/applications/%{name}.desktop" +- "%{_datadir}/themes/base/meegotouch/%{name}" +- "%{_datadir}/%{name}/qml" +- "%{_datadir}/l10n/meegotouch/%{name}.qm" +- "%{_datadir}/%{name}/AUTHORS" +- "%{_datadir}/%{name}/ChangeLog" +- "%{_datadir}/%{name}/LICENSE" +- "%{_datadir}/%{name}/README" +- "%{_datadir}/%{name}/TODO" +