diff options
| -rw-r--r-- | COPYING | 340 | ||||
| -rw-r--r-- | HISTORY | 6 | ||||
| -rw-r--r-- | Makefile | 82 | ||||
| -rw-r--r-- | README | 11 | ||||
| -rw-r--r-- | extrecmenu.c | 85 | ||||
| -rw-r--r-- | extrecmenu.h | 148 | ||||
| -rw-r--r-- | i18n.c | 48 | ||||
| -rw-r--r-- | i18n.h | 12 | ||||
| -rw-r--r-- | mymenumoverecording.c | 218 | ||||
| -rw-r--r-- | mymenurecordings.c | 357 | ||||
| -rw-r--r-- | mymenurenamerecording.c | 72 | ||||
| -rw-r--r-- | myreplaycontrol.c | 415 |
12 files changed, 1794 insertions, 0 deletions
@@ -0,0 +1,340 @@ + GNU GENERAL PUBLIC LICENSE + Version 2, June 1991 + + Copyright (C) 1989, 1991 Free Software Foundation, Inc. + 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 Library 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. + + <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 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., 59 Temple Place, Suite 330, Boston, MA 02111-1307 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. + + <signature of Ty Coon>, 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 Library General +Public License instead of this License. @@ -0,0 +1,6 @@ +VDR Plugin 'extrecmenu' Revision History +---------------------------------------- + +2006-03-06: Version 0.0.1 + +- Initial revision. diff --git a/Makefile b/Makefile new file mode 100644 index 0000000..09d33c0 --- /dev/null +++ b/Makefile @@ -0,0 +1,82 @@ +# +# Makefile for a Video Disk Recorder plugin +# +# $Id$ + +# The official name of this plugin. +# This name will be used in the '-P...' option of VDR to load the plugin. +# By default the main source file also carries this name. +# +PLUGIN = extrecmenu + +### The version number of this plugin (taken from the main source file): + +VERSION = $(shell grep 'static const char \*VERSION *=' $(PLUGIN).h | awk '{ print $$6 }' | sed -e 's/[";]//g') + +### The C++ compiler and options: + +CXX ?= g++ +CXXFLAGS ?= -fPIC -g -O2 -Wall -Woverloaded-virtual + +### The directory environment: + +DVBDIR = ../../../../DVB +VDRDIR = ../../.. +LIBDIR = ../../lib +TMPDIR = /tmp + +### Allow user defined options to overwrite defaults: + +-include $(VDRDIR)/Make.config + +### The version number of VDR (taken from VDR's "config.h"): + +VDRVERSION = $(shell grep 'define VDRVERSION ' $(VDRDIR)/config.h | awk '{ print $$3 }' | sed -e 's/"//g') + +### The name of the distribution archive: + +ARCHIVE = $(PLUGIN)-$(VERSION) +PACKAGE = vdr-$(ARCHIVE) + +### Includes and Defines (add further entries here): + +INCLUDES += -I$(VDRDIR)/include -I$(DVBDIR)/include + +DEFINES += -D_GNU_SOURCE -DPLUGIN_NAME_I18N='"$(PLUGIN)"' + +### The object files (add further files here): + +OBJS = $(PLUGIN).o mymenurecordings.o myreplaycontrol.o mymenurenamerecording.o mymenumoverecording.o i18n.o + +### Implicit rules: + +%.o: %.c + $(CXX) $(CXXFLAGS) -c $(DEFINES) $(INCLUDES) $< + +# Dependencies: + +MAKEDEP = $(CXX) -MM -MG +DEPFILE = .dependencies +$(DEPFILE): Makefile + @$(MAKEDEP) $(DEFINES) $(INCLUDES) $(OBJS:%.o=%.c) > $@ + +-include $(DEPFILE) + +### Targets: + +all: libvdr-$(PLUGIN).so + +libvdr-$(PLUGIN).so: $(OBJS) + $(CXX) $(CXXFLAGS) -shared $(OBJS) -o $@ + @cp $@ $(LIBDIR)/$@.$(VDRVERSION) + +dist: clean + @-rm -rf $(TMPDIR)/$(ARCHIVE) + @mkdir $(TMPDIR)/$(ARCHIVE) + @cp -a * $(TMPDIR)/$(ARCHIVE) + @tar czf $(PACKAGE).tgz -C $(TMPDIR) $(ARCHIVE) + @-rm -rf $(TMPDIR)/$(ARCHIVE) + @echo Distribution package created as $(PACKAGE).tgz + +clean: + @-rm -f $(OBJS) $(DEPFILE) *.so *.tgz core* *~ @@ -0,0 +1,11 @@ +This is a "plugin" for the Video Disk Recorder (VDR). + +Written by: Martin Prochnow (nordlicht@martins-kabuff.de) + +Project's homepage: http://martins-kabuff.de/extrecmenu.html + +See the file COPYING for license information. + +Description: +This plugin provides a recordings menu enhanced with the possibility to +rename or move recordings. diff --git a/extrecmenu.c b/extrecmenu.c new file mode 100644 index 0000000..0adf67e --- /dev/null +++ b/extrecmenu.c @@ -0,0 +1,85 @@ +#include "extrecmenu.h" + +cPluginExtrecmenu::cPluginExtrecmenu(void) +{ + // Initialize any member variables here. + // DON'T DO ANYTHING ELSE THAT MAY HAVE SIDE EFFECTS, REQUIRE GLOBAL + // VDR OBJECTS TO EXIST OR PRODUCE ANY OUTPUT! +} + +cPluginExtrecmenu::~cPluginExtrecmenu() +{ + // Clean up after yourself! +} + +const char *cPluginExtrecmenu::CommandLineHelp(void) +{ + // Return a string that describes all known command line options. + return NULL; +} + +bool cPluginExtrecmenu::ProcessArgs(int argc, char *argv[]) +{ + // Implement command line argument processing here if applicable. + return true; +} + +bool cPluginExtrecmenu::Initialize(void) +{ + RegisterI18n(Phrases); + return true; +} + +bool cPluginExtrecmenu::Start(void) +{ + // Start any background activities the plugin shall perform. + return true; +} + +void cPluginExtrecmenu::Stop(void) +{ + // Stop any background activities the plugin shall perform. +} + +void cPluginExtrecmenu::Housekeeping(void) +{ + // Perform any cleanup or other regular tasks. +} + +cOsdObject *cPluginExtrecmenu::MainMenuAction(void) +{ + // Perform the action when selected from the main VDR menu. + return new myMenuRecordings(); +} + +cMenuSetupPage *cPluginExtrecmenu::SetupMenu(void) +{ + // Return a setup menu in case the plugin supports one. + return NULL; +} + +bool cPluginExtrecmenu::SetupParse(const char *Name, const char *Value) +{ + // Parse your own setup parameters and store their values. + return false; +} + +bool cPluginExtrecmenu::Service(const char *Id, void *Data) +{ + // Handle custom service requests from other plugins + return false; +} + +const char **cPluginExtrecmenu::SVDRPHelpPages(void) +{ + // Return help text for SVDRP commands this plugin implements + return NULL; +} + +cString cPluginExtrecmenu::SVDRPCommand(const char *Command, const char *Option, int &ReplyCode) +{ + // Process SVDRP commands this plugin implements + return NULL; +} + +VDRPLUGINCREATOR(cPluginExtrecmenu); // Don't touch this! diff --git a/extrecmenu.h b/extrecmenu.h new file mode 100644 index 0000000..64f3e95 --- /dev/null +++ b/extrecmenu.h @@ -0,0 +1,148 @@ +#include <vdr/plugin.h> +#include <vdr/menu.h> +#include <vdr/interface.h> +#include <vdr/status.h> +#include <vdr/skins.h> +#include <vdr/dvbplayer.h> +#include <vdr/cutter.h> +#include <vdr/videodir.h> +#include "i18n.h" + +#define MODETIMEOUT 3 // seconds + +static const char *VERSION = "0.1"; +static const char *DESCRIPTION = "Extended recordings menu"; +static const char *MAINMENUENTRY = "ExtRecMenu"; + +extern bool clearall; // needed for myMenuMoveRecording + +// --- cPluginExtrecmenu ------------------------------------------------------ +class cPluginExtrecmenu:public cPlugin +{ + private: + public: + cPluginExtrecmenu(void); + virtual ~cPluginExtrecmenu(); + virtual const char *Version(void){return VERSION;} + virtual const char *Description(void){return tr(DESCRIPTION);} + virtual const char *CommandLineHelp(void); + virtual bool ProcessArgs(int argc,char *argv[]); + virtual bool Initialize(void); + virtual bool Start(void); + virtual void Stop(void); + virtual void Housekeeping(void); + virtual const char *MainMenuEntry(void){return MAINMENUENTRY;} + virtual cOsdObject *MainMenuAction(void); + virtual cMenuSetupPage *SetupMenu(void); + virtual bool SetupParse(const char *Name,const char *Value); + virtual bool Service(const char *Id,void *Data = NULL); + virtual const char **SVDRPHelpPages(void); + virtual cString SVDRPCommand(const char *Command,const char *Option,int &ReplyCode); +}; + +// --- myMenuRecordingsItem --------------------------------------------------- +class myMenuRecordingsItem:public cOsdItem +{ + private: + int level,isdirectory; + char *title; + char *name; + const char *filename; + public: + myMenuRecordingsItem(cRecording *Recording,int Level); + ~myMenuRecordingsItem(); + const char *FileName(){return filename;} + const char *Name(){return name;} + bool IsDirectory(){return name!=NULL;} +}; + +// --- myMenuRecordings ------------------------------------------------------- +class myMenuRecordings:public cOsdMenu +{ + private: + bool edit; + int level,helpkeys; + char *base; + bool Open(); + void SetHelpKeys(); + cRecording *GetRecording(myMenuRecordingsItem *Item); + eOSState Play(); + eOSState Rewind(); + eOSState Delete(); + eOSState Rename(); + eOSState MoveRec(); + public: + myMenuRecordings(const char *Base=NULL,int Level=0); + ~myMenuRecordings(); + void Set(); + virtual eOSState ProcessKey(eKeys Key); +}; + +// --- myMenuRenameRecording -------------------------------------------------- +class myMenuRenameRecording:public cOsdMenu +{ + private: + char name[MaxFileName]; + char path[MaxFileName]; + cRecording *recording; + myMenuRecordings *menurecordings; + public: + myMenuRenameRecording(cRecording *Recording,myMenuRecordings *MenuRecordings); + virtual eOSState ProcessKey(eKeys Key); +}; + +// --- myMenuMoveRecording ---------------------------------------------------- +class myMenuMoveRecording:public cOsdMenu +{ + private: + int level; + char *base; + cRecording *recording; + myMenuRecordings *menurecordings; + void Set(); + eOSState Open(); + eOSState MoveRec(); + eOSState Create(); + public: + myMenuMoveRecording(cRecording *Recording,myMenuRecordings *MenuRecordings,const char *Base=NULL,int Level=0); + myMenuMoveRecording::~myMenuMoveRecording(); + virtual eOSState ProcessKey(eKeys Key); +}; + +// --- myReplayControls ------------------------------------------------------- +class myReplayControl : public cDvbPlayerControl { +private: + cSkinDisplayReplay *displayReplay; + cMarks marks; + bool visible, modeOnly, shown, displayFrames; + int lastCurrent, lastTotal; + bool lastPlay, lastForward; + int lastSpeed; + time_t timeoutShow; + bool timeSearchActive, timeSearchHide; + int timeSearchTime, timeSearchPos; + void TimeSearchDisplay(void); + void TimeSearchProcess(eKeys Key); + void TimeSearch(void); + void ShowTimed(int Seconds = 0); + static char *fileName; + static char *title; + void ShowMode(void); + bool ShowProgress(bool Initial); + void MarkToggle(void); + void MarkJump(bool Forward); + void MarkMove(bool Forward); + void EditCut(void); + void EditTest(void); +public: + myReplayControl(void); + virtual ~myReplayControl(); + virtual cOsdObject *GetInfo(void); + virtual eOSState ProcessKey(eKeys Key); + virtual void Show(void); + virtual void Hide(void); + bool Visible(void) { return visible; } + static void SetRecording(const char *FileName, const char *Title); + static const char *LastReplayed(void); + static void ClearLastReplayed(const char *FileName); + }; @@ -0,0 +1,48 @@ +/* + * See the README file for copyright information and how to reach the author. + */ + +#include "i18n.h" + +const tI18nPhrase Phrases[] = { + { "Extended recordings menu", + "Erweitertes Aufzeichnungs-Menü", + }, + { "Button$Open", + "Öffnen", + }, + { "Button$Cancel", + "Abbrechen", + }, + { "Button$Play", + "Wiedergabe", + }, + { "Button$Rewind", + "Anfang", + }, + { "Button$Create", + "Anlegen", + }, + { "Button$Select", + "Auswählen", + }, + { "Button$Edit", + "Editieren", + }, + { "Button$Rename", + "Umbenennen", + }, + { "Button$Move", + "Verschieben", + }, + { "Button$Delete", + "Löschen", + }, + { "New folder", + "Neues Verzeichnis", + }, + { "Rename recording", + "Aufzeichnung umbenennen", + }, + { NULL } + }; @@ -0,0 +1,12 @@ +/* + * See the README file for copyright information and how to reach the author. + */ + +#ifndef _I18N__H +#define _I18N__H + +#include <vdr/i18n.h> + +extern const tI18nPhrase Phrases[]; + +#endif //_I18N__H diff --git a/mymenumoverecording.c b/mymenumoverecording.c new file mode 100644 index 0000000..f0a64d1 --- /dev/null +++ b/mymenumoverecording.c @@ -0,0 +1,218 @@ +#include "extrecmenu.h" + +bool clearall; +char newname[128]; + +// --- myMenuNewName ---------------------------------------------------------- +class myMenuNewName:public cOsdMenu +{ + private: + char name[128]; + public: + myMenuNewName(); + virtual eOSState ProcessKey(eKeys Key); +}; + +myMenuNewName::myMenuNewName():cOsdMenu(tr("New folder"),12) +{ + strn0cpy(name,tr("New folder"),sizeof(name)); + Add(new cMenuEditStrItem(tr("Name"),name,sizeof(name),tr(FileNameChars))); +} + +eOSState myMenuNewName::ProcessKey(eKeys Key) +{ + eOSState state=cOsdMenu::ProcessKey(Key); + + if(state==osUnknown) + { + if(Key==kOk) + { + strn0cpy(newname,name,sizeof(newname)); + state=osBack; + } + } + + return state; +} + +// --- myMenuMoveRecordingItem ------------------------------------------------ +class myMenuMoveRecordingItem:public cOsdItem +{ + private: + int level; + char *title; + public: + myMenuMoveRecordingItem(cRecording *Recording,int Level); +}; + +myMenuMoveRecordingItem::myMenuMoveRecordingItem(cRecording *Recording,int Level) +{ + level=0; + const char *s=Recording->Name(); + while(*++s) + { + if(*s=='~') + level++; + } + + if(Level<level) + { + s=Recording->Name(); + while(Level) + { + s=strchr(Recording->Name(),'~')+1; + Level--; + } + title=strdup(s); + char *p=strchr(title,'~'); + if(p) + *p=0; + SetText(title); + } + else + SetText(""); +} + +// --- myMenuMoveRecording ---------------------------------------------------- +myMenuMoveRecording::myMenuMoveRecording(cRecording *Recording,myMenuRecordings *MenuRecordings,const char *Base,int Level):cOsdMenu(Base?Base:"") +{ + strn0cpy(newname,"",sizeof(newname)); + recording=Recording; + menurecordings=MenuRecordings; + base=Base?strdup(Base):NULL; + level=Level; + Set(); + SetHelp(tr("Button$Cancel"),NULL,tr("Button$Create"),tr("Button$Select")); +} + +myMenuMoveRecording::~myMenuMoveRecording() +{ + free(base); +} + +void myMenuMoveRecording::Set() +{ + char *lastitemtext=NULL; + for(cRecording *recording=Recordings.First();recording;recording=Recordings.Next(recording)) + { + if(!base||(strstr(recording->Name(),base)==recording->Name()&&recording->Name()[strlen(base)]=='~')) + { + myMenuMoveRecordingItem *item=new myMenuMoveRecordingItem(recording,level); + if(*item->Text()&&(!lastitemtext||strcmp(lastitemtext,item->Text()))) + { + Add(item); + free(lastitemtext); + lastitemtext=strdup(item->Text()); + } + else + delete item; + } + } + free(lastitemtext); +} + +eOSState myMenuMoveRecording::Open() +{ + if(newname[0]!=0) + { + const char *t; + char buffer[MaxFileName]; + if(base) + snprintf(buffer,sizeof(buffer),"%s~%s",base,newname); + else + snprintf(buffer,sizeof(buffer),"%s",newname); + t=buffer; + return AddSubMenu(new myMenuMoveRecording(recording,menurecordings,t,level+1)); + } + else + { + myMenuMoveRecordingItem *item=(myMenuMoveRecordingItem*)Get(Current()); + if(item) + { + const char *t=item->Text(); + char buffer[MaxFileName]; + if(base) + { + snprintf(buffer,sizeof(buffer),"%s~%s",base,t); + t=buffer; + } + return AddSubMenu(new myMenuMoveRecording(recording,menurecordings,t,level+1)); + } + } + return osContinue; +} + +eOSState myMenuMoveRecording::MoveRec() +{ + char *name; + + char *p=strrchr(recording->Name(),'~'); + if(p) + { + if(base) + asprintf(&name,"%s~%s",base,++p); + else + asprintf(&name,"%s",++p); + } + else + { + if(base) + asprintf(&name,"%s~%s",base,recording->Name()); + else + asprintf(&name,"%s",recording->Name()); + } + + char *newfilename; + asprintf(&newfilename,"%s/%s/%s",VideoDirectory,ExchangeChars(name,true),strrchr(recording->FileName(),'/')+1); + + int result=MakeDirs(newfilename,true); + if(result) + { + result=RenameVideoFile(recording->FileName(),newfilename); + if(result) + { + // update recordings list + Recordings.Update(true); + // update menu + menurecordings->Set(); + // close move-recordings-menu + clearall=true; + } + else + Skins.Message(mtError,tr("Error while accessing recording!")); + } + else + Skins.Message(mtError,tr("Error while accessing recording!")); + + return osContinue; +} + +eOSState myMenuMoveRecording::Create() +{ + return AddSubMenu(new myMenuNewName); +} + +eOSState myMenuMoveRecording::ProcessKey(eKeys Key) +{ + eOSState state=cOsdMenu::ProcessKey(Key); + + if(state==osUnknown) + { + switch(Key) + { + case kRed: clearall=true;break; + case kYellow: return Create(); + case kBlue: return MoveRec(); + case kOk: return Open(); + default: break; + } + } + + if(newname[0]!=0) + return Open(); + + if(clearall) + return osBack; + + return state; +} diff --git a/mymenurecordings.c b/mymenurecordings.c new file mode 100644 index 0000000..e1bf15b --- /dev/null +++ b/mymenurecordings.c @@ -0,0 +1,357 @@ +#include "extrecmenu.h" + +// --- myMenuRecordingsItem --------------------------------------------------- +myMenuRecordingsItem::myMenuRecordingsItem(cRecording *Recording,int Level) +{ + name=NULL; + filename=Recording->FileName(); + + // get the level of this recording + level=0; + const char *s=Recording->Name(); + while(*++s) + { + if(*s=='~') + level++; + } + + // create the title of this item + if(Level<level) + { + s=Recording->Name(); + while(Level) + { + s=strchr(Recording->Name(),'~')+1; + Level--; + } + title=strdup(s); + char *p=strchr(title,'~'); + if(p) + *p=0; + name=strdup(title); + } + else + if(Level==level) + { + s=strrchr(Recording->Name(),'~'); + if(s) + title=strdup(s+1); + else + title=strdup(Recording->Name()); + } + else + if(Level>level) + { + title=""; + } + + SetText(title); +} + +myMenuRecordingsItem::~myMenuRecordingsItem() +{ + free(title); + free(name); +} + +// --- myMenuRecordings ------------------------------------------------------- +myMenuRecordings::myMenuRecordings(const char *Base,int Level):cOsdMenu(Base?Base:tr(DESCRIPTION)) +{ + edit=false; + level=Level; + helpkeys=-1; + base=Base?strdup(Base):NULL; + + Set(); + SetHelpKeys(); +} + +myMenuRecordings::~myMenuRecordings() +{ + free(base); +} + +void myMenuRecordings::Set() +{ + char *lastitemtext=NULL; + + cThreadLock RecordingsLock(&Recordings); + Clear(); + Recordings.Sort(); + + // add first the directories + for(cRecording *recording=Recordings.First();recording;recording=Recordings.Next(recording)) + { + if(!base||(strstr(recording->Name(),base)==recording->Name()&&recording->Name()[strlen(base)]=='~')) + { + myMenuRecordingsItem *item=new myMenuRecordingsItem(recording,level); + if(item->IsDirectory()&&*item->Text()&&(!lastitemtext||strcmp(lastitemtext,item->Text()))) + { + Add(item); + free(lastitemtext); + lastitemtext=strdup(item->Text()); + } + else + delete item; + } + } + // and now the recordings + for(cRecording *recording=Recordings.First();recording;recording=Recordings.Next(recording)) + { + if(!base||(strstr(recording->Name(),base)==recording->Name()&&recording->Name()[strlen(base)]=='~')) + { + myMenuRecordingsItem *item=new myMenuRecordingsItem(recording,level); + if(!item->IsDirectory()&&*item->Text()&&(!lastitemtext||strcmp(lastitemtext,item->Text()))) + { + Add(item); + free(lastitemtext); + lastitemtext=strdup(item->Text()); + } + else + delete item; + } + } + free(lastitemtext); + Display(); +} + +void myMenuRecordings::SetHelpKeys() +{ + if(!HasSubMenu()) + { + myMenuRecordingsItem *item=(myMenuRecordingsItem*)Get(Current()); + int newhelpkeys=0; + if(item) + { + if(item->IsDirectory()) + newhelpkeys=1; + else + { + newhelpkeys=2; + } + if(newhelpkeys!=helpkeys) + { + switch(newhelpkeys) + { + case 0: SetHelp(NULL);break; + case 1: SetHelp(tr("Button$Open"));break; + case 2: + case 3: SetHelp(tr("Button$Play"),tr("Button$Rewind"),tr("Button$Edit"));break; + } + } + helpkeys=newhelpkeys; + } + } +} + +cRecording *myMenuRecordings::GetRecording(myMenuRecordingsItem *Item) +{ + cRecording *recording=Recordings.GetByName(Item->FileName()); + if(!recording) + Skins.Message(mtError,tr("Error while accessing recording!")); + return recording; +} + +bool myMenuRecordings::Open() +{ + myMenuRecordingsItem *item=(myMenuRecordingsItem*)Get(Current()); + if(item&&item->IsDirectory()) + { + const char *t=item->Name(); + char *buffer=NULL; + if(base) + { + asprintf(&buffer,"%s~%s",base,t); + t=buffer; + } + AddSubMenu(new myMenuRecordings(t,level+1)); + free(buffer); + return true; + } + return false; +} + +eOSState myMenuRecordings::Play() +{ + myMenuRecordingsItem *item=(myMenuRecordingsItem*)Get(Current()); + if(item) + { + if(item->IsDirectory()) + Open(); + else + { + cRecording *recording=GetRecording(item); + if(recording) + { + myReplayControl::SetRecording(recording->FileName(),recording->Title()); + cControl::Shutdown(); // stop running playbacks + cControl::Launch(new myReplayControl); // start playback + return osEnd; // close plugin + } + } + } + return osContinue; +} + +eOSState myMenuRecordings::Rewind() +{ + if(HasSubMenu()||Count()==0) + return osContinue; + + myMenuRecordingsItem *item=(myMenuRecordingsItem*)Get(Current()); + if(item&&!item->IsDirectory()) + { + cDevice::PrimaryDevice()->StopReplay(); + cResumeFile ResumeFile(item->FileName()); + ResumeFile.Delete(); + return Play(); + } + return osContinue; +} + +eOSState myMenuRecordings::Delete() +{ + if(HasSubMenu()||Count()==0) + return osContinue; + + myMenuRecordingsItem *item=(myMenuRecordingsItem*)Get(Current()); + if(item&&!item->IsDirectory()) + { + if(Interface->Confirm(tr("Delete recording?"))) + { + cRecordControl *rc=cRecordControls::GetRecordControl(item->FileName()); + if(rc) + { + if(Interface->Confirm(tr("Timer still recording - really delete?"))) + { + cTimer *timer=rc->Timer(); + if(timer) + { + timer->Skip(); + cRecordControls::Process(time(NULL)); + if(timer->IsSingleEvent()) + { + isyslog("deleting timer %s",*timer->ToDescr()); + Timers.Del(timer); + } + Timers.SetModified(); + } + } + else + return osContinue; + } + cRecording *recording=GetRecording(item); + if(recording) + { + if(recording->Delete()) + { + myReplayControl::ClearLastReplayed(item->FileName()); + Recordings.DelByName(item->FileName()); + cOsdMenu::Del(Current()); + SetHelpKeys(); + Display(); + if(!Count()) + return osBack; + } + else + Skins.Message(mtError,tr("Error while deleting recording!")); + } + } + } + return osContinue; +} + +eOSState myMenuRecordings::Rename() +{ + if(HasSubMenu()||Count()==0) + return osContinue; + + myMenuRecordingsItem *item=(myMenuRecordingsItem*)Get(Current()); + if(item&&!item->IsDirectory()) + { + cRecording *recording=GetRecording(item); + if(recording) + return AddSubMenu(new myMenuRenameRecording(recording,this)); + } + return osContinue; +} + +eOSState myMenuRecordings::MoveRec() +{ + if(HasSubMenu()||Count()==0) + return osContinue; + + myMenuRecordingsItem *item=(myMenuRecordingsItem*)Get(Current()); + if(item&&!item->IsDirectory()) + { + cRecording *recording=GetRecording(item); + if(recording) + { + clearall=false; + return AddSubMenu(new myMenuMoveRecording(recording,this)); + } + } + return osContinue; +} + +eOSState myMenuRecordings::ProcessKey(eKeys Key) +{ + eOSState state; + + if(edit) + { + switch(Key) + { + case kRed: edit=false; + helpkeys=-1; + return Rename(); + case kGreen: edit=false, + helpkeys=-1; + return MoveRec(); + case kYellow: edit=false; + helpkeys=-1; + return Delete(); + case kBack: edit=false; + helpkeys=-1; + SetHelpKeys(); + default: break; + } + state=osContinue; + } + else + { + bool hadsubmenu=HasSubMenu(); + state=cOsdMenu::ProcessKey(Key); + if(state==osUnknown) + { + switch(Key) + { + case kOk: + case kRed: return Play(); + case kGreen: return Rewind(); + case kYellow: { + myMenuRecordingsItem *item=(myMenuRecordingsItem*)Get(Current()); + if(item&&!item->IsDirectory()) + { + edit=true; + SetHelp(tr("Button$Rename"),tr("Button$Move"),tr("Button$Delete")); + } + break; + } + default: break; + } + } + + // refresh the list after submenu has closed + if(hadsubmenu&&!HasSubMenu()) + Set(); + + // go back if list is empty + if(!Count()) + state=osBack; + + if(!HasSubMenu()&&Key!=kNone); + SetHelpKeys(); + } + return state; +} diff --git a/mymenurenamerecording.c b/mymenurenamerecording.c new file mode 100644 index 0000000..492a3c6 --- /dev/null +++ b/mymenurenamerecording.c @@ -0,0 +1,72 @@ +#include "extrecmenu.h" + +myMenuRenameRecording::myMenuRenameRecording(cRecording *Recording,myMenuRecordings *MenuRecordings):cOsdMenu(tr("Rename recording"),12) +{ + recording=Recording; + menurecordings=MenuRecordings; + + char *p=strrchr(recording->Name(),'~'); + if(p) + { + strn0cpy(name,++p,sizeof(name)); + strn0cpy(path,recording->Name(),sizeof(path)); + + p=strrchr(path,'~'); + if(p) + *p=0; + } + else + { + strn0cpy(name,recording->Name(),sizeof(name)); + strn0cpy(path,"",sizeof(path)); + } + Add(new cMenuEditStrItem(tr("Name"),name,sizeof(name),tr(FileNameChars))); +} + +eOSState myMenuRenameRecording::ProcessKey(eKeys Key) +{ + eOSState state=cOsdMenu::ProcessKey(Key); + if(state==osUnknown) + { + if(Key==kOk) + { + int result; + char *buffer; + char *newFileName; + + if(strlen(path)) + asprintf(&buffer,"%s~%s",path,name); + else + asprintf(&buffer,"%s",name); + + asprintf(&newFileName,"%s/%s/%s",VideoDirectory,ExchangeChars(buffer,true),strrchr(recording->FileName(),'/')+1); + + result=MakeDirs(newFileName,true); + if(result) + { + result=RenameVideoFile(recording->FileName(),newFileName); + if(result) + { + // update recordings list + Recordings.Update(true); + // update menu + menurecordings->Set(); + return osBack; + } + else + { + Skins.Message(mtError,tr("Error while accessing recording!")); + state=osContinue; + } + } + else + { + Skins.Message(mtError,tr("Error while accessing recording!")); + state=osContinue; + } + free(buffer); + free(newFileName); + } + } + return state; +} diff --git a/myreplaycontrol.c b/myreplaycontrol.c new file mode 100644 index 0000000..f88d447 --- /dev/null +++ b/myreplaycontrol.c @@ -0,0 +1,415 @@ +#include "extrecmenu.h" + +char *myReplayControl::fileName = NULL; +char *myReplayControl::title = NULL; + +myReplayControl::myReplayControl(void) +:cDvbPlayerControl(fileName) +{ + displayReplay = NULL; + visible = modeOnly = shown = displayFrames = false; + lastCurrent = lastTotal = -1; + lastPlay = lastForward = false; + lastSpeed = -1; + timeoutShow = 0; + timeSearchActive = false; + marks.Load(fileName); + cRecording Recording(fileName); + cStatus::MsgReplaying(this, Recording.Name(), Recording.FileName(), true); +} + +myReplayControl::~myReplayControl() +{ + Hide(); + cStatus::MsgReplaying(this, NULL, fileName, false); + Stop(); +// --- <my changes> --- +// calls the main menu of this plugin after playback ends + cRemote::CallPlugin("extrecmenu"); +// --- </my changes> --- +} + +void myReplayControl::SetRecording(const char *FileName, const char *Title) +{ + free(fileName); + free(title); + fileName = FileName ? strdup(FileName) : NULL; + title = Title ? strdup(Title) : NULL; +} + +const char *myReplayControl::LastReplayed(void) +{ + return fileName; +} + +void myReplayControl::ClearLastReplayed(const char *FileName) +{ + if (fileName && FileName && strcmp(fileName, FileName) == 0) { + free(fileName); + fileName = NULL; + } +} + +void myReplayControl::ShowTimed(int Seconds) +{ + if (modeOnly) + Hide(); + if (!visible) { + shown = ShowProgress(true); + timeoutShow = (shown && Seconds > 0) ? time(NULL) + Seconds : 0; + } +} + +void myReplayControl::Show(void) +{ + ShowTimed(); +} + +void myReplayControl::Hide(void) +{ + if (visible) { + delete displayReplay; + displayReplay = NULL; + needsFastResponse = visible = false; + modeOnly = false; + lastPlay = lastForward = false; + lastSpeed = -1; + timeSearchActive = false; + } +} + +void myReplayControl::ShowMode(void) +{ + if (visible || Setup.ShowReplayMode && !cOsd::IsOpen()) { + bool Play, Forward; + int Speed; + if (GetReplayMode(Play, Forward, Speed) && (!visible || Play != lastPlay || Forward != lastForward || Speed != lastSpeed)) { + bool NormalPlay = (Play && Speed == -1); + + if (!visible) { + if (NormalPlay) + return; // no need to do indicate ">" unless there was a different mode displayed before + visible = modeOnly = true; + displayReplay = Skins.Current()->DisplayReplay(modeOnly); + } + + if (modeOnly && !timeoutShow && NormalPlay) + timeoutShow = time(NULL) + MODETIMEOUT; + displayReplay->SetMode(Play, Forward, Speed); + lastPlay = Play; + lastForward = Forward; + lastSpeed = Speed; + } + } +} + +bool myReplayControl::ShowProgress(bool Initial) +{ + int Current, Total; + + if (GetIndex(Current, Total) && Total > 0) { + if (!visible) { + displayReplay = Skins.Current()->DisplayReplay(modeOnly); + displayReplay->SetMarks(&marks); + needsFastResponse = visible = true; + } + if (Initial) { + if (title) + displayReplay->SetTitle(title); + lastCurrent = lastTotal = -1; + } + if (Total != lastTotal) { + displayReplay->SetTotal(IndexToHMSF(Total)); + if (!Initial) + displayReplay->Flush(); + } + if (Current != lastCurrent || Total != lastTotal) { + displayReplay->SetProgress(Current, Total); + if (!Initial) + displayReplay->Flush(); + displayReplay->SetCurrent(IndexToHMSF(Current, displayFrames)); + displayReplay->Flush(); + lastCurrent = Current; + } + lastTotal = Total; + ShowMode(); + return true; + } + return false; +} + +void myReplayControl::TimeSearchDisplay(void) +{ + char buf[64]; + strcpy(buf, tr("Jump: ")); + int len = strlen(buf); + char h10 = '0' + (timeSearchTime >> 24); + char h1 = '0' + ((timeSearchTime & 0x00FF0000) >> 16); + char m10 = '0' + ((timeSearchTime & 0x0000FF00) >> 8); + char m1 = '0' + (timeSearchTime & 0x000000FF); + char ch10 = timeSearchPos > 3 ? h10 : '-'; + char ch1 = timeSearchPos > 2 ? h1 : '-'; + char cm10 = timeSearchPos > 1 ? m10 : '-'; + char cm1 = timeSearchPos > 0 ? m1 : '-'; + sprintf(buf + len, "%c%c:%c%c", ch10, ch1, cm10, cm1); + displayReplay->SetJump(buf); +} + +void myReplayControl::TimeSearchProcess(eKeys Key) +{ +#define STAY_SECONDS_OFF_END 10 + int Seconds = (timeSearchTime >> 24) * 36000 + ((timeSearchTime & 0x00FF0000) >> 16) * 3600 + ((timeSearchTime & 0x0000FF00) >> 8) * 600 + (timeSearchTime & 0x000000FF) * 60; + int Current = (lastCurrent / FRAMESPERSEC); + int Total = (lastTotal / FRAMESPERSEC); + switch (Key) { + case k0 ... k9: + if (timeSearchPos < 4) { + timeSearchTime <<= 8; + timeSearchTime |= Key - k0; + timeSearchPos++; + TimeSearchDisplay(); + } + break; + case kFastRew: + case kLeft: + case kFastFwd: + case kRight: { + int dir = ((Key == kRight || Key == kFastFwd) ? 1 : -1); + if (dir > 0) + Seconds = min(Total - Current - STAY_SECONDS_OFF_END, Seconds); + SkipSeconds(Seconds * dir); + timeSearchActive = false; + } + break; + case kPlay: + case kUp: + case kPause: + case kDown: + case kOk: + Seconds = min(Total - STAY_SECONDS_OFF_END, Seconds); + Goto(Seconds * FRAMESPERSEC, Key == kDown || Key == kPause || Key == kOk); + timeSearchActive = false; + break; + default: + timeSearchActive = false; + break; + } + + if (!timeSearchActive) { + if (timeSearchHide) + Hide(); + else + displayReplay->SetJump(NULL); + ShowMode(); + } +} + +void myReplayControl::TimeSearch(void) +{ + timeSearchTime = timeSearchPos = 0; + timeSearchHide = false; + if (modeOnly) + Hide(); + if (!visible) { + Show(); + if (visible) + timeSearchHide = true; + else + return; + } + timeoutShow = 0; + TimeSearchDisplay(); + timeSearchActive = true; +} + +void myReplayControl::MarkToggle(void) +{ + int Current, Total; + if (GetIndex(Current, Total, true)) { + cMark *m = marks.Get(Current); + lastCurrent = -1; // triggers redisplay + if (m) + marks.Del(m); + else { + marks.Add(Current); + ShowTimed(2); + bool Play, Forward; + int Speed; + if (GetReplayMode(Play, Forward, Speed) && !Play) + Goto(Current, true); + } + + marks.Save(); + } +} + +void myReplayControl::MarkJump(bool Forward) +{ + if (marks.Count()) { + int Current, Total; + if (GetIndex(Current, Total)) { + cMark *m = Forward ? marks.GetNext(Current) : marks.GetPrev(Current); + if (m) { + Goto(m->position, true); + displayFrames = true; + } + } + } +} + +void myReplayControl::MarkMove(bool Forward) +{ + int Current, Total; + if (GetIndex(Current, Total)) { + cMark *m = marks.Get(Current); + if (m) { + displayFrames = true; + int p = SkipFrames(Forward ? 1 : -1); + cMark *m2; + if (Forward) { + if ((m2 = marks.Next(m)) != NULL && m2->position <= p) + return; + } + else { + if ((m2 = marks.Prev(m)) != NULL && m2->position >= p) + return; + } + Goto(m->position = p, true); + marks.Save(); + } + } +} + +void myReplayControl::EditCut(void) +{ + if (fileName) { + Hide(); + if (!cCutter::Active()) { + if (!marks.Count()) + Skins.Message(mtError, tr("No editing marks defined!")); + else if (!cCutter::Start(fileName)) + Skins.Message(mtError, tr("Can't start editing process!")); + else + Skins.Message(mtInfo, tr("Editing process started")); + } + else + Skins.Message(mtError, tr("Editing process already active!")); + ShowMode(); + } +} + +void myReplayControl::EditTest(void) +{ + int Current, Total; + if (GetIndex(Current, Total)) { + cMark *m = marks.Get(Current); + if (!m) + m = marks.GetNext(Current); + if (m) { + if ((m->Index() & 0x01) != 0) + m = marks.Next(m); + if (m) { + Goto(m->position - SecondsToFrames(3)); + Play(); + } + } + } +} + +cOsdObject *myReplayControl::GetInfo(void) +{ +// cRecording *Recording = Recordings.GetByName(myReplayControl::LastReplayed()); +// if (Recording) +// return new myMenuRecording(Recording, false); + return NULL; +} + +eOSState myReplayControl::ProcessKey(eKeys Key) +{ + if (!Active()) + return osEnd; + if (visible) { + if (timeoutShow && time(NULL) > timeoutShow) { + Hide(); + ShowMode(); + timeoutShow = 0; + } + else if (modeOnly) + ShowMode(); + else + shown = ShowProgress(!shown) || shown; + } + bool DisplayedFrames = displayFrames; + displayFrames = false; + if (timeSearchActive && Key != kNone) { + TimeSearchProcess(Key); + return osContinue; + } + bool DoShowMode = true; + switch (Key) { + // Positioning: + case kPlay: + case kUp: Play(); break; + case kPause: + case kDown: Pause(); break; + case kFastRew|k_Release: + case kLeft|k_Release: + if (Setup.MultiSpeedMode) break; + case kFastRew: + case kLeft: Backward(); break; + case kFastFwd|k_Release: + case kRight|k_Release: + if (Setup.MultiSpeedMode) break; + case kFastFwd: + case kRight: Forward(); break; + case kRed: TimeSearch(); break; + case kGreen|k_Repeat: + case kGreen: SkipSeconds(-60); break; + case kYellow|k_Repeat: + case kYellow: SkipSeconds( 60); break; + case kStop: + case kBlue: Hide(); + Stop(); + return osEnd; + default: { + DoShowMode = false; + switch (Key) { + // Editing: + case kMarkToggle: MarkToggle(); break; + case kMarkJumpBack|k_Repeat: + case kMarkJumpBack: MarkJump(false); break; + case kMarkJumpForward|k_Repeat: + case kMarkJumpForward: MarkJump(true); break; + case kMarkMoveBack|k_Repeat: + case kMarkMoveBack: MarkMove(false); break; + case kMarkMoveForward|k_Repeat: + case kMarkMoveForward: MarkMove(true); break; + case kEditCut: EditCut(); break; + case kEditTest: EditTest(); break; + default: { + displayFrames = DisplayedFrames; + switch (Key) { + // Menu control: + case kOk: if (visible && !modeOnly) { + Hide(); + DoShowMode = true; + } + else + Show(); + break; +// --- <my changes> --- +// changed to get the plugin main menu instead of the recordings menu +// because this one line i had the build this hole class new :-D +// case kBack: return osRecordings; + case kBack: return osEnd; +// --- </my changes> --- + default: return osUnknown; + } + } + } + } + } + if (DoShowMode) + ShowMode(); + return osContinue; +} |