mirror of
				https://github.com/vdr-projects/vdr.git
				synced 2025-03-01 10:50:46 +00:00 
			
		
		
		
	Dropped the unused "Stop recording on primary interface" stuff
This commit is contained in:
		
							
								
								
									
										1
									
								
								HISTORY
									
									
									
									
									
								
							
							
						
						
									
										1
									
								
								HISTORY
									
									
									
									
									
								
							| @@ -4005,3 +4005,4 @@ Video Disk Recorder Revision History | ||||
|   If the event is already marked with 'T', the "Red" button opens the "Edit | ||||
|   timer" menu for that timer. | ||||
| - Removing deleted recordings is now done in a separate thread. | ||||
| - Dropped the unused "stop recording on primary interface" stuff. | ||||
|   | ||||
							
								
								
									
										23
									
								
								i18n.c
									
									
									
									
									
								
							
							
						
						
									
										23
									
								
								i18n.c
									
									
									
									
									
								
							| @@ -4,7 +4,7 @@ | ||||
|  * See the main source file 'vdr.c' for copyright information and | ||||
|  * how to reach the author. | ||||
|  * | ||||
|  * $Id: i18n.c 1.220 2005/11/04 14:36:27 kls Exp $ | ||||
|  * $Id: i18n.c 1.221 2005/12/28 12:35:20 kls Exp $ | ||||
|  * | ||||
|  * Translations provided by: | ||||
|  * | ||||
| @@ -1115,27 +1115,6 @@ const tI18nPhrase Phrases[] = { | ||||
|     "L<EFBFBD>petan salvestamise?", | ||||
|     "Stop optagelse?", | ||||
|   }, | ||||
|   { "on primary interface", | ||||
|     "auf dem prim<69>ren Interface", | ||||
|     "na primarni napravi", | ||||
|     "su interfaccia primaria", | ||||
|     "op eerste interface", | ||||
|     "no interface prim<69>rio", | ||||
|     "sur la carte primaire", | ||||
|     "p<EFBFBD> f<>rste enhet", | ||||
|     "ensisijaisella sovittimella", | ||||
|     "na pierwszym interfejsie", | ||||
|     "en interface primario", | ||||
|     "<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>", | ||||
|     "fr<EFBFBD>n den f<>rsta enheten?", | ||||
|     "pe prima interfa<66><61>", | ||||
|     "az els<6C> k<>rty<74>n", | ||||
|     "a la interf<72>cie prim<69>ria", | ||||
|     "<EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>", | ||||
|     "na primarnom ure<72>aju", | ||||
|     "peavastuv<EFBFBD>tjal", | ||||
|     "p<EFBFBD> prim<69>r enhed", | ||||
|   }, | ||||
|   { "Cancel editing?", | ||||
|     "Schneiden abbrechen?", | ||||
|     "<EFBFBD>elite prekiniti urejanje?", | ||||
|   | ||||
							
								
								
									
										32
									
								
								menu.c
									
									
									
									
									
								
							
							
						
						
									
										32
									
								
								menu.c
									
									
									
									
									
								
							| @@ -4,7 +4,7 @@ | ||||
|  * See the main source file 'vdr.c' for copyright information and | ||||
|  * how to reach the author. | ||||
|  * | ||||
|  * $Id: menu.c 1.381 2005/12/28 11:35:33 kls Exp $ | ||||
|  * $Id: menu.c 1.382 2005/12/28 12:35:54 kls Exp $ | ||||
|  */ | ||||
|  | ||||
| #include "menu.h" | ||||
| @@ -2581,7 +2581,6 @@ cMenuPluginItem::cMenuPluginItem(const char *Name, int Index) | ||||
| // --- cMenuMain ------------------------------------------------------------- | ||||
|  | ||||
| #define STOP_RECORDING tr(" Stop recording ") | ||||
| #define ON_PRIMARY_INTERFACE tr("on primary interface") | ||||
|  | ||||
| cOsdObject *cMenuMain::pluginOsdObject = NULL; | ||||
|  | ||||
| @@ -2649,15 +2648,6 @@ void cMenuMain::Set(void) | ||||
|   if (Commands.Count()) | ||||
|      Add(new cOsdItem(hk(tr("Commands")),  osCommands)); | ||||
|  | ||||
|   // Record control: | ||||
|  | ||||
|   if (cRecordControls::StopPrimary()) { | ||||
|      char *buffer = NULL; | ||||
|      asprintf(&buffer, "%s%s", STOP_RECORDING, ON_PRIMARY_INTERFACE); | ||||
|      Add(new cOsdItem(buffer, osStopRecord)); | ||||
|      free(buffer); | ||||
|      } | ||||
|  | ||||
|   Update(true); | ||||
|  | ||||
|   Display(); | ||||
| @@ -2753,11 +2743,7 @@ eOSState cMenuMain::ProcessKey(eKeys Key) | ||||
|     case osStopRecord: if (Interface->Confirm(tr("Stop recording?"))) { | ||||
|                           cOsdItem *item = Get(Current()); | ||||
|                           if (item) { | ||||
|                              const char *s = item->Text() + strlen(STOP_RECORDING); | ||||
|                              if (strcmp(s, ON_PRIMARY_INTERFACE) == 0) | ||||
|                                 cRecordControls::StopPrimary(true); | ||||
|                              else | ||||
|                                 cRecordControls::Stop(item->Text() + strlen(STOP_RECORDING)); | ||||
|                              cRecordControls::Stop(item->Text() + strlen(STOP_RECORDING)); | ||||
|                              return osEnd; | ||||
|                              } | ||||
|                           } | ||||
| @@ -3455,20 +3441,6 @@ void cRecordControls::Stop(cDevice *Device) | ||||
|       } | ||||
| } | ||||
|  | ||||
| bool cRecordControls::StopPrimary(bool DoIt) | ||||
| { | ||||
|   if (cDevice::PrimaryDevice()->Receiving()) { | ||||
|      //XXX+ disabled for the moment - might become obsolete with DVB_DRIVER_VERSION >= 2002090101 | ||||
|      cDevice *device = NULL;//XXX cDevice::GetDevice(cDevice::PrimaryDevice()->Ca(), 0); | ||||
|      if (device) { | ||||
|         if (DoIt) | ||||
|            Stop(cDevice::PrimaryDevice()); | ||||
|         return true; | ||||
|         } | ||||
|      } | ||||
|   return false; | ||||
| } | ||||
|  | ||||
| bool cRecordControls::PauseLiveVideo(void) | ||||
| { | ||||
|   Skins.Message(mtStatus, tr("Pausing live video...")); | ||||
|   | ||||
							
								
								
									
										3
									
								
								menu.h
									
									
									
									
									
								
							
							
						
						
									
										3
									
								
								menu.h
									
									
									
									
									
								
							| @@ -4,7 +4,7 @@ | ||||
|  * See the main source file 'vdr.c' for copyright information and | ||||
|  * how to reach the author. | ||||
|  * | ||||
|  * $Id: menu.h 1.78 2005/12/24 15:44:56 kls Exp $ | ||||
|  * $Id: menu.h 1.79 2005/12/28 12:32:51 kls Exp $ | ||||
|  */ | ||||
|  | ||||
| #ifndef __MENU_H | ||||
| @@ -201,7 +201,6 @@ public: | ||||
|   static bool Start(cTimer *Timer = NULL, bool Pause = false); | ||||
|   static void Stop(const char *InstantId); | ||||
|   static void Stop(cDevice *Device); | ||||
|   static bool StopPrimary(bool DoIt = false); | ||||
|   static bool PauseLiveVideo(void); | ||||
|   static const char *GetInstantId(const char *LastInstantId); | ||||
|   static cRecordControl *GetRecordControl(const char *FileName); | ||||
|   | ||||
		Reference in New Issue
	
	Block a user