Klaus Schmidinger
|
c49253824a
|
Replaced time_ms() with a threadsafe and non-overflowing cTimeMs
|
2004-12-19 18:08:09 +01:00 |
|
Klaus Schmidinger
|
c77989ee70
|
Added support for AC3 replay over the DVB device
|
2004-12-17 14:55:49 +01:00 |
|
Klaus Schmidinger
|
b04f71562d
|
Fixed a possible crash when pausing live video and the recording was unable to start
|
2004-11-20 11:00:26 +01:00 |
|
Klaus Schmidinger
|
c054f39620
|
Implemented sort modes for the 'Channels' menu
|
2004-11-01 13:59:58 +01:00 |
|
Klaus Schmidinger
|
0b62aff0e3
|
Now using qsort() to sort cListBase lists
|
2004-11-01 10:40:38 +01:00 |
|
Klaus Schmidinger
|
fd9c2d298c
|
Now handling the channel name, short name and provider separately
|
2004-10-31 12:53:00 +01:00 |
|
Klaus Schmidinger
|
5e731865a6
|
Making sure that timers and channels are only saved together
|
2004-10-31 10:22:32 +01:00 |
|
Klaus Schmidinger
|
fc0596d859
|
Immediately displaying the new channel info when switching channel groups
|
2004-10-30 15:37:16 +02:00 |
|
Klaus Schmidinger
|
30dfd2e701
|
Now only saving channels.conf after a modification made by the user
|
2004-10-17 11:50:21 +02:00 |
|
Klaus Schmidinger
|
9f18dbc8cf
|
Fixed a crash in the time search mechanism
|
2004-10-16 16:12:02 +02:00 |
|
Klaus Schmidinger
|
1a2ddff60d
|
Fixed showing the replay mode if the OSD is currently in use
|
2004-10-16 10:26:34 +02:00 |
|
Klaus Schmidinger
|
15030f6ace
|
Fixed a crash in case the last line in channels.conf is a group separator
|
2004-08-08 14:31:33 +02:00 |
|
Klaus Schmidinger
|
c896678b0c
|
Fixed a possible NULL pointer assignment in cMenuText::SetText()
|
2004-08-08 14:21:17 +02:00 |
|
Klaus Schmidinger
|
5ed57fa1c5
|
The list of recordings is now kept statically in memory
|
2004-06-13 20:26:51 +02:00 |
|
Klaus Schmidinger
|
d42c223826
|
Fixed displaying the current channel when switching via the SVDRP command CHAN
|
2004-06-06 09:48:17 +02:00 |
|
Klaus Schmidinger
|
a4bdc1ada3
|
Fixed removing the "scanning recordings..." message in case the video directory is empty
|
2004-05-29 10:23:21 +02:00 |
|
Klaus Schmidinger
|
41873ff43c
|
Added some missing cStatus::MsgOsdTextItem() calls
|
2004-05-23 11:22:47 +02:00 |
|
Klaus Schmidinger
|
a3d32f5862
|
Added a missing cStatus::MsgOsdClear() to cDisplayChannel::~cDisplayChannel()
|
2004-05-23 10:35:59 +02:00 |
|
Klaus Schmidinger
|
4c5aedbd79
|
Added SetText() to cMenuText
|
2004-05-23 09:54:06 +02:00 |
|
Klaus Schmidinger
|
d10624fbca
|
Moved the declaration of cMenuText to VDR/menu.h to make it available to plugins
|
2004-05-23 09:40:38 +02:00 |
|
Klaus Schmidinger
|
5aacc51c14
|
Single shot timers and events now show the day of week
|
2004-05-22 13:23:22 +02:00 |
|
Klaus Schmidinger
|
38c8159730
|
Fixed setting the time from the DVB data stream
|
2004-05-16 12:58:04 +02:00 |
|
Klaus Schmidinger
|
5d99df7b77
|
Implemented 'skins' and 'themes'
|
2004-05-16 10:35:36 +02:00 |
|
Klaus Schmidinger
|
3c4010bb75
|
Moved several menu item classes from menu.c to menuitems.[hc] to make them available for plugins
|
2004-03-28 09:20:02 +02:00 |
|
Klaus Schmidinger
|
07dc53331e
|
Removed cSchedule::GetEventNumber() and cSchedule::NumEvents()
|
2004-03-14 13:27:57 +01:00 |
|
Klaus Schmidinger
|
5f39e62ea1
|
Improved performance when paging through very long menu lists
|
2004-03-14 10:34:56 +01:00 |
|
Klaus Schmidinger
|
e070d5462c
|
Fixed handling timers in VPS margin if the EPG scan is turned on
|
2004-03-07 09:40:51 +01:00 |
|
Klaus Schmidinger
|
18d3851b72
|
Fixed assigning events to timers (they no longer get "stuck")
|
2004-03-06 11:27:08 +01:00 |
|
Klaus Schmidinger
|
198fcf437b
|
Implemented VPS controlled timers
|
2004-02-29 14:21:22 +01:00 |
|
Klaus Schmidinger
|
98f3934a58
|
Added 'CheckRunningStatus' when getting present/following event
|
2004-02-22 14:14:55 +01:00 |
|
Klaus Schmidinger
|
5f0a84d1bf
|
Checking group sep
|
2004-02-22 13:43:55 +01:00 |
|
Klaus Schmidinger
|
8e61663652
|
Implemented handling the VPS timestamps
|
2004-02-22 13:33:20 +01:00 |
|
Klaus Schmidinger
|
1601918327
|
Making sure the present event is displayed in the "Schedule" menu
|
2004-02-21 15:40:35 +01:00 |
|
Klaus Schmidinger
|
6fef98aa97
|
Implemented an "EPG linger time"
|
2004-02-21 15:30:35 +01:00 |
|
Klaus Schmidinger
|
340d9bcb0f
|
The EPG data is now always kept sorted chronologically in the internal data structures
|
2004-02-21 13:56:20 +01:00 |
|
Klaus Schmidinger
|
0a3f7e7ca2
|
Limited automatic retuning to devices that actually provide the transponder
|
2004-02-15 14:31:53 +01:00 |
|
Klaus Schmidinger
|
30d262fa88
|
Fixed editing and creating new channels
|
2004-02-13 13:36:52 +01:00 |
|
Klaus Schmidinger
|
327db5aee3
|
Removed the now obsolete CaCaps stuff
|
2004-02-08 15:11:07 +01:00 |
|
Klaus Schmidinger
|
0d6715d862
|
No longer closing the Channels menu after trying to switch to a channel that is currently not available
|
2004-02-08 14:15:01 +01:00 |
|
Klaus Schmidinger
|
958c84f00a
|
Implemented 32 audio and Dolby PIDs; storing audio language in channels.conf
|
2004-01-25 15:32:08 +01:00 |
|
Klaus Schmidinger
|
e4960d169e
|
The "Red" button in the "Setup/EPG" menu can now be used to force an EPG scan on a single DVB card system
|
2004-01-17 15:38:11 +01:00 |
|
Klaus Schmidinger
|
89ecc6b452
|
Fixed resetting the EPG data versions after changing the preferred languages
|
2004-01-11 21:42:23 +01:00 |
|
Klaus Schmidinger
|
7f9d14ee8b
|
The actual transponder data is now taken from the NIT
|
2004-01-11 15:54:37 +01:00 |
|
Klaus Schmidinger
|
6484771bf6
|
Added support for selecting preferred EPG languages
|
2004-01-09 15:53:59 +01:00 |
|
Klaus Schmidinger
|
6096500940
|
Added 'Update channels' setup parameter
|
2004-01-05 12:08:09 +01:00 |
|
Klaus Schmidinger
|
8976ebcec5
|
Implemented automatic PID switching and channel detection
|
2004-01-04 12:30:00 +01:00 |
|
Klaus Schmidinger
|
7ff59171e3
|
Changed section handling; replaced 'libdtv' with 'libsi'
|
2003-12-22 13:29:24 +01:00 |
|
Klaus Schmidinger
|
c94570e69d
|
Changed font handling to allow language specific character sets; adopted the small font character set from the "Elchi" patch
|
2003-10-24 12:53:12 +02:00 |
|
Klaus Schmidinger
|
4eecc59ef8
|
Fixed missing channel info after an incomplete channel group switch
|
2003-10-03 14:38:49 +02:00 |
|
Klaus Schmidinger
|
903148b5ad
|
Added 'repeat' function keys '7' and '9' ("jump to mark") in replay mode
|
2003-09-14 10:53:06 +02:00 |
|
Klaus Schmidinger
|
6d677e2a89
|
When setting an editing mark while in "Pause" mode, replay now immediately jumps to the marked frame
|
2003-09-06 10:35:24 +02:00 |
|
Klaus Schmidinger
|
8d89fb4983
|
Fixed handling the "Red" button in the "Schedules" menu in case there are no events listed for a particular channel
|
2003-09-05 13:34:17 +02:00 |
|
Klaus Schmidinger
|
056c902c21
|
Fixed starting a recording on the primary device if there is a replay session active
|
2003-08-24 14:47:34 +02:00 |
|
Klaus Schmidinger
|
b65687ebcf
|
Made the "Zap timeout" a setup variable
|
2003-08-17 08:58:02 +02:00 |
|
Klaus Schmidinger
|
2eec57fe18
|
Fixed freezing replay if a timer starts while in Transfer Mode
|
2003-08-16 13:24:23 +02:00 |
|
Klaus Schmidinger
|
2e9ef13f1c
|
Fixed a crash when starting "Pause live video" twice within the same minute on the same channel
|
2003-08-16 10:41:21 +02:00 |
|
Klaus Schmidinger
|
d369eb9408
|
Fixed keeping track of the current channel number when moving channels in the "Channels" menu
|
2003-08-09 10:19:33 +02:00 |
|
Klaus Schmidinger
|
f8386cdd8b
|
Added the usual menu timeout to the CAM menus
|
2003-08-03 09:54:18 +02:00 |
|
Klaus Schmidinger
|
746b232299
|
Fixed a possible crash in case a VFAT file system is used without compiling VDR with VFAT=1
|
2003-08-02 13:23:58 +02:00 |
|
Klaus Schmidinger
|
0485e5ad00
|
Fixed handling channel switching through numeric input in case the channel numbers contain gaps
|
2003-07-26 16:10:39 +02:00 |
|
Klaus Schmidinger
|
1ea8f44953
|
Fixed handling the color buttons in the "Edit channel" menu
|
2003-07-26 10:09:38 +02:00 |
|
Klaus Schmidinger
|
7a79fef0c8
|
Now clearing the channel info display when entering numeric keys to switch channels
|
2003-06-19 10:10:14 +02:00 |
|
Klaus Schmidinger
|
8635511b28
|
Fixed creating a new channel in the "Channels" menu in case the 'channels.conf' contains ':@nnn' lines with no text
|
2003-06-15 12:29:56 +02:00 |
|
Klaus Schmidinger
|
bc16b8af53
|
Improved channel switching in case of numerical input
|
2003-06-13 14:44:31 +02:00 |
|
Klaus Schmidinger
|
68002f0037
|
Fixed a bug in channel switching after Left/Right has been pressed
|
2003-06-12 20:37:14 +02:00 |
|
Klaus Schmidinger
|
50076b8059
|
Fixed device handling in the CICAM menu in case a VDR instance was started with a specific device using the -D option
|
2003-06-07 12:56:19 +02:00 |
|
Klaus Schmidinger
|
2390d7b1fd
|
Fixed a crash when cancelling a newly created timer
|
2003-06-06 15:02:37 +02:00 |
|
Klaus Schmidinger
|
3208f4eddd
|
Fixed editing channels ('timers.conf' was not written)
|
2003-06-06 13:30:52 +02:00 |
|
Klaus Schmidinger
|
77b56da51f
|
Fixed breaking off replay in case the user hits "Play" or "Pause" too soon after going into "Pause live video" mode
|
2003-05-30 13:23:54 +02:00 |
|
Klaus Schmidinger
|
b8c2934668
|
Fixed an uninitialized variable in cDisplayChannel
|
2003-05-29 11:45:13 +02:00 |
|
Klaus Schmidinger
|
984c51ef91
|
Single event timers are now deleted if the recording they are doing is deleted before the timer ends
|
2003-05-29 11:39:29 +02:00 |
|
Klaus Schmidinger
|
d2d2b75b2c
|
Added an additional sleep() after going into "Pause live video" mode
|
2003-05-29 09:47:31 +02:00 |
|
Klaus Schmidinger
|
ffc7a80577
|
It is now possible to directly delete a timer that is currently recording
|
2003-05-25 14:14:32 +02:00 |
|
Klaus Schmidinger
|
7e5878856f
|
Fixed handling newly created timers in case they are not confirmed with "Ok"
|
2003-05-25 13:58:21 +02:00 |
|
Klaus Schmidinger
|
0eb11ea3de
|
Checking for duplicate recordings with the same file name and disabling the second timer
|
2003-05-25 12:56:26 +02:00 |
|
Klaus Schmidinger
|
faafa62587
|
Fixed cReplayControl::Show() to avoid a compiler warning in g++ 3.2.3
|
2003-05-24 16:41:35 +02:00 |
|
Klaus Schmidinger
|
7399d8eff4
|
No longer starting the editing process if no marks have been set
|
2003-05-16 12:46:15 +02:00 |
|
Klaus Schmidinger
|
2a7472b00a
|
Removed a faulty parameter initialization in menu.c
|
2003-05-11 16:10:06 +02:00 |
|
Klaus Schmidinger
|
c6e759f436
|
Implemented separate PausePriority and PauseLifetime parameters for the recordings created when pausing live video
|
2003-05-11 14:10:00 +02:00 |
|
Klaus Schmidinger
|
9f2238885f
|
Avoiding short display of the 'Main' menu when pressing the 'Recordings' button or the 'Back' button during replay
|
2003-05-11 12:21:58 +02:00 |
|
Klaus Schmidinger
|
9e650825c2
|
The red ('Record') and yellow ('Pause') button in the 'Main' menu are no longer available when replaying
|
2003-05-03 16:08:44 +02:00 |
|
Klaus Schmidinger
|
007c4a5a01
|
Reduced the time to wait for EPG data when starting a recording to 3 seconds
|
2003-04-27 12:51:01 +02:00 |
|
Klaus Schmidinger
|
a86ed8181b
|
Fixed deleting the last recording in the 'Recordings' menu, which started pausing live video
|
2003-04-26 13:53:50 +02:00 |
|
Klaus Schmidinger
|
fd0774c811
|
The PCR PID can now be set separately from the video PID
|
2003-04-26 11:58:54 +02:00 |
|
Klaus Schmidinger
|
a54427e28d
|
Implemented 'pause live video'
|
2003-04-21 14:57:13 +02:00 |
|
Klaus Schmidinger
|
6bdfa4638d
|
Enhanced detection of pending user I/O from CAMs
|
2003-04-20 09:53:08 +02:00 |
|
Klaus Schmidinger
|
7c84508417
|
Implemented a 'resume ID' which allows several users to each have their own resume.vdr files
|
2003-04-12 10:06:21 +02:00 |
|
Klaus Schmidinger
|
8ddaaf9849
|
Timers are now processed even if a menu is open
|
2003-02-09 13:14:44 +01:00 |
|
Klaus Schmidinger
|
777f330c77
|
Improved CAM support
|
2003-02-09 11:54:22 +01:00 |
|
Klaus Schmidinger
|
413b22dc63
|
Implemented actual user input for CAM enquiry menus
|
2003-01-19 14:59:46 +01:00 |
|
Klaus Schmidinger
|
8de63a62e2
|
CAM menu now always returns osEnd when Ok is pressed
|
2003-01-06 16:13:53 +01:00 |
|
Klaus Schmidinger
|
4e15f6d658
|
Implemented 'Link Layer' based CAM support
|
2003-01-06 14:44:27 +01:00 |
|
Klaus Schmidinger
|
de1366fc7e
|
Fixed handling channels in the 'Channels' menu in case there are ':@nnn' group separators without names
|
2002-12-22 12:49:10 +01:00 |
|
Klaus Schmidinger
|
816e6847aa
|
Macros in 'keymacros.conf' can now use "@plugin" to directly access the main menu function of a given plugin
|
2002-12-01 10:48:08 +01:00 |
|
Klaus Schmidinger
|
88db59f61a
|
No longer displaying channel group delimiters without text
|
2002-11-29 14:19:08 +01:00 |
|
Klaus Schmidinger
|
82ccabff8a
|
Added NID, TID and RID to the channel definitions
|
2002-11-24 14:48:38 +01:00 |
|
Klaus Schmidinger
|
08e4f36ccd
|
Plugins can now have their own raw OSD
|
2002-11-24 10:45:39 +01:00 |
|
Klaus Schmidinger
|
c05b788deb
|
Fixed a compiler warning regarding cMenuChannels::Del() and MenuTimers::Del()
|
2002-11-10 16:07:58 +01:00 |
|
Klaus Schmidinger
|
9fee2b67ab
|
First step towards a 'unique channel ID'
|
2002-11-10 15:50:21 +01:00 |
|
Klaus Schmidinger
|
5a418a9efe
|
Fixed displaying the group separators in the channel display
|
2002-11-01 12:18:45 +01:00 |
|
Klaus Schmidinger
|
74c74fb5d2
|
Implemented additional dedicated keys
|
2002-10-27 14:32:06 +01:00 |
|
Klaus Schmidinger
|
ff127786d0
|
Fixed log message when editing a channel
|
2002-10-20 14:22:09 +02:00 |
|
Klaus Schmidinger
|
ac9622bb8a
|
Timers now internally have a pointer to their channel
|
2002-10-20 12:28:55 +02:00 |
|
Klaus Schmidinger
|
ab4ceb29a0
|
Implemented gaps in channel numbering
|
2002-10-19 15:33:37 +02:00 |
|
Klaus Schmidinger
|
95c8c2b60c
|
New configuration file 'reccmds.conf'
|
2002-10-13 12:14:49 +02:00 |
|
Klaus Schmidinger
|
a19ea98cce
|
Automatically closing 'Commands' menu if command doesn't return any output
|
2002-10-13 09:16:32 +02:00 |
|
Klaus Schmidinger
|
e58fa67e6c
|
Implemented '?' handling for commands.conf
|
2002-10-13 09:03:53 +02:00 |
|
Klaus Schmidinger
|
ec5795bda2
|
Reactivated full handling of second audio PID (even in 'Transfer Mode')
|
2002-10-12 14:29:46 +02:00 |
|
Klaus Schmidinger
|
371b9be00b
|
Fixed switching the video format in the Setup/DVB menu
|
2002-10-12 09:13:05 +02:00 |
|
Klaus Schmidinger
|
186ee74748
|
Fixed a bug when pressing the Blue button in the main menu without having displayed it
|
2002-10-06 14:11:59 +02:00 |
|
Klaus Schmidinger
|
b7d3273d92
|
Changed cMenuRecordings::Del() to cMenuRecordings::Delete() to avoid a warning in gcc-3.2
|
2002-10-06 10:40:27 +02:00 |
|
Klaus Schmidinger
|
962596f4ab
|
Modified channel handling; full DiSEqC support
|
2002-10-06 10:25:42 +02:00 |
|
Klaus Schmidinger
|
fc66860847
|
Made remote controls plugin aware
|
2002-09-29 13:40:45 +02:00 |
|
Klaus Schmidinger
|
f24f820e7d
|
Changed NeedsSwitchChannel to NeedsDetachReceivers
|
2002-09-06 14:10:17 +02:00 |
|
Klaus Schmidinger
|
3e58bc64fe
|
Implemented recording and replaying with a single DVB card
|
2002-09-04 17:26:02 +02:00 |
|
Klaus Schmidinger
|
9239d3e6df
|
Fixed handling one-shot timers that were already recording and had their start time changed into the future
|
2002-08-25 10:59:49 +02:00 |
|
Klaus Schmidinger
|
ac471850fe
|
Moved FileNameChars into menuitems.h to make it available to plugins
|
2002-08-15 11:28:26 +02:00 |
|
Klaus Schmidinger
|
9a1a16f3d4
|
Consistently using malloc/free and new/delete
|
2002-08-11 13:32:23 +02:00 |
|
Klaus Schmidinger
|
15cc1733e0
|
Changed the cDevice class to allow plugins to implement their own devices
|
2002-08-04 14:57:29 +02:00 |
|
Klaus Schmidinger
|
8be5a7b7b2
|
Changed the symantics of the Name parameter in cStatus::Recording() and cStatus::Replaying()
|
2002-07-14 11:03:30 +02:00 |
|
Klaus Schmidinger
|
cd030554e5
|
Switched VDR's own player to the new cPlayer/cControl structures
|
2002-06-23 11:23:34 +02:00 |
|
Klaus Schmidinger
|
0bb9a1a77b
|
Moved handling of the Menu key entirely into vdr.c
|
2002-06-23 09:44:00 +02:00 |
|
Klaus Schmidinger
|
359e90b8a7
|
Activated transfer mode
|
2002-06-22 13:45:53 +02:00 |
|
Klaus Schmidinger
|
7ade39597a
|
Activated cutting
|
2002-06-22 10:11:59 +02:00 |
|
Klaus Schmidinger
|
3ab746babd
|
Changed 'cStatusMonitor' to 'cStatus'
|
2002-06-16 13:26:00 +02:00 |
|
Klaus Schmidinger
|
a4bfddd2f9
|
Totally rearranged device/player/recorder structures
|
2002-06-16 12:57:31 +02:00 |
|
Klaus Schmidinger
|
9f9d6a8a93
|
Implemented cStatusMonitor to allow plugins to set up a status monitor
|
2002-05-19 15:50:11 +02:00 |
|
Klaus Schmidinger
|
bdccbbe93e
|
Completely moved OSD handling out of the cDvbApi class, into the new cOsd
|
2002-05-18 14:03:22 +02:00 |
|
Klaus Schmidinger
|
3e5b31af5e
|
Rearranged OSD class names to make 'cOsd' available for the main OSD interface
|
2002-05-18 12:41:18 +02:00 |
|
Klaus Schmidinger
|
d4893ad1fe
|
Improved the [eid]syslog() macros
|
2002-05-13 16:35:49 +02:00 |
|
Klaus Schmidinger
|
51eb880da0
|
Improved implementation of setup menus for plugins
|
2002-05-11 13:44:58 +02:00 |
|
Klaus Schmidinger
|
b527b27708
|
Implemented plugin interface
|
2002-05-09 16:26:56 +02:00 |
|
Klaus Schmidinger
|
eefd2b88f1
|
Fixed the unit of the 'SVDRP timeout' setup parameter
|
2002-05-01 14:57:12 +02:00 |
|
Klaus Schmidinger
|
2ac56b497d
|
Default duration of instant recording is 3 hours (and configurable)
|
2002-04-26 13:43:46 +02:00 |
|
Klaus Schmidinger
|
9b840b07c4
|
Fixed a crash when selecting the 'Jump' function directly after setting an editing mark
|
2002-04-20 09:23:02 +02:00 |
|
Klaus Schmidinger
|
59aecc0254
|
Improved enhanced string editing (cont'd)
|
2002-04-20 09:06:51 +02:00 |
|
Klaus Schmidinger
|
69d32fae06
|
Improved enhanced string editing
|
2002-04-19 15:46:14 +02:00 |
|
Klaus Schmidinger
|
3554e3acad
|
Improved enhanced string editing
|
2002-04-16 16:11:40 +02:00 |
|
Klaus Schmidinger
|
cba5ef4373
|
Implemented enhanced string editing
|
2002-04-13 10:52:01 +02:00 |
|
Klaus Schmidinger
|
ea6f46d5fb
|
Added Spanish language texts
|
2002-04-06 09:51:08 +02:00 |
|
Klaus Schmidinger
|
967ec9f2d4
|
Fixed a problem with wrong EPG data in the Schedules menu
|
2002-04-02 20:59:05 +02:00 |
|
Klaus Schmidinger
|
2331fb9cc1
|
Fixed skipping the next hit of a repeating timer
|
2002-03-31 21:24:10 +02:00 |
|
Klaus Schmidinger
|
837ce0a299
|
Changed time entry in the 'Jump' command during replay, so that it is filled up from right to left
|
2002-03-31 15:26:18 +02:00 |
|
Klaus Schmidinger
|
cebd81cd60
|
Added units to Setup parameters
|
2002-03-31 13:39:56 +02:00 |
|
Klaus Schmidinger
|
72962ccdd7
|
Fixed a bug in switching back the replay mode display in time shift mode
|
2002-03-31 10:57:28 +02:00 |
|
Klaus Schmidinger
|
d9b6236191
|
Adjusting column width for channel numbers in case there are more than 999 channels
|
2002-03-29 10:50:20 +01:00 |
|
Klaus Schmidinger
|
56839d8d39
|
Fixed a memory leak
|
2002-03-23 15:17:14 +01:00 |
|
Klaus Schmidinger
|
ca479d90df
|
Displaying command to be executed in status line
|
2002-03-23 15:16:12 +01:00 |
|
Klaus Schmidinger
|
70db7f17bc
|
Added i18n of 'Disk' in main menu title
|
2002-03-22 14:39:45 +01:00 |
|
Klaus Schmidinger
|
b305ea6b02
|
Changed 'TrustedTransponder' to 'TimeTransponder'
|
2002-03-17 14:24:11 +01:00 |
|
Klaus Schmidinger
|
dea51d37a9
|
Refined texts of the 'Setup' menu
|
2002-03-17 14:11:22 +01:00 |
|
Klaus Schmidinger
|
b72b15cf8f
|
New Setup item 'Restart'
|
2002-03-17 12:04:35 +01:00 |
|
Klaus Schmidinger
|
ae3f18dd57
|
The 'Commands' menu now automatically assigns number keys as hotkeys to the commands
|
2002-03-16 16:48:14 +01:00 |
|
Klaus Schmidinger
|
25abe47a3b
|
The 'Left' and 'Right' keys are now used to page up and down in text displays
|
2002-03-16 14:08:12 +01:00 |
|
Klaus Schmidinger
|
80bc132236
|
Fixed displaying a system message while the replay mode is being shown
|
2002-03-16 11:38:27 +01:00 |
|
Klaus Schmidinger
|
92358d6a4e
|
Changed the title of the 'Main' menu to 'VDR'
|
2002-03-16 10:09:54 +01:00 |
|
Klaus Schmidinger
|
d9cfa43d85
|
Grouped the Setup parameters into several sub-menus
|
2002-03-16 10:03:04 +01:00 |
|
Klaus Schmidinger
|
f9a3885ef2
|
New Setup parameter TrustedTransponder
|
2002-03-10 12:45:58 +01:00 |
|
Klaus Schmidinger
|
d5c01bbe5a
|
Implemented OSD for Volume and Mute
|
2002-03-09 17:11:49 +01:00 |
|
Klaus Schmidinger
|
9e20745fde
|
Blue button is now 'Stop' in 'Main' menu if replaying
|
2002-03-08 16:11:34 +01:00 |
|
Klaus Schmidinger
|
5d666161d6
|
Fixed reacting on changes in CICAM settings (needed to restart VDR before)
|
2002-03-08 15:19:49 +01:00 |
|
Klaus Schmidinger
|
9d4456a0a3
|
CICAM setup for conditional access channels
|
2002-03-03 16:12:29 +01:00 |
|
Klaus Schmidinger
|
715ed57ab1
|
Removed DVD support from the core VDR source
|
2002-02-24 14:07:21 +01:00 |
|
Klaus Schmidinger
|
7f3c58f857
|
New Setup parameter RecordDolbyDigital
|
2002-02-24 11:55:24 +01:00 |
|
Klaus Schmidinger
|
db7f6ee619
|
Accessing Schedules data directly via cSIProcessor
|
2002-02-23 13:55:57 +01:00 |
|
Klaus Schmidinger
|
ca31e87591
|
Saving 'timers.conf' after setting 'firstday' when deleting an ongoing recording
|
2002-02-23 09:33:04 +01:00 |
|
Klaus Schmidinger
|
3db87e806c
|
Taking EPG data from 'start + 5min' for instant recordings
|
2002-02-17 16:03:49 +01:00 |
|
Klaus Schmidinger
|
e18b303818
|
Terminating timer when deleting recording
|
2002-02-17 14:29:13 +01:00 |
|
Klaus Schmidinger
|
a87e7625dd
|
Implemented the 'First day' parameter for repeating timers
|
2002-02-17 13:05:05 +01:00 |
|
Klaus Schmidinger
|
219ccb51a7
|
If Setup.ShowInfoOnChSwitch is set to 'no', the box for the EPG display is no longer shown
|
2002-02-10 11:58:17 +01:00 |
|
Klaus Schmidinger
|
ba1bf3a99e
|
Automatically closing empty recordings menu page after delete
|
2002-02-10 11:36:07 +01:00 |
|
Klaus Schmidinger
|
13a0aff6b9
|
Reverted to the previous way of searching for the EPG record of the current recording in case of a periodic timer
|
2002-02-09 15:27:39 +01:00 |
|
Klaus Schmidinger
|
889e70803f
|
Changed the estimated data rate for calculating the remaining disk capacity to 25.75 MB/min
|
2002-02-09 14:42:56 +01:00 |
|
Klaus Schmidinger
|
deb9f88710
|
Implemented TITLE and EPISODE keywords
|
2002-02-03 15:55:04 +01:00 |
|
Klaus Schmidinger
|
103124c82c
|
Fixed handling hierarchical recordings menu in case of directories starting with the same sequence of characters
|
2002-02-01 15:11:39 +01:00 |
|
Klaus Schmidinger
|
3669bbf375
|
Activating the 'Recordings' menu now displays 'scanning recordings...'
|
2002-01-27 15:55:31 +01:00 |
|
Klaus Schmidinger
|
28e54bc648
|
The 'Main' menu now displays the used disk space in the title
|
2002-01-27 13:11:23 +01:00 |
|
Klaus Schmidinger
|
e010ca2106
|
Fixed hierarchical recordings menu
|
2002-01-26 11:09:25 +01:00 |
|
Klaus Schmidinger
|
fd839aae7b
|
The 'Recordings' menu now displays a hierarchical structure
|
2002-01-20 14:05:28 +01:00 |
|
Klaus Schmidinger
|
21f13f0ef1
|
Removed EPGBugfixLevel '3'
|
2002-01-13 16:18:40 +01:00 |
|
Klaus Schmidinger
|
c1dd84e0e9
|
Changed the maximum value for PIDs in channels.conf from 0xFFFE to 0x1FFF
|
2001-11-24 13:21:16 +01:00 |
|
Klaus Schmidinger
|
01bff47d1c
|
Implemented DVB-T support; Removed the range limits for the Frequency and Srate parameters of channel definitions
|
2001-11-24 11:42:43 +01:00 |
|
Klaus Schmidinger
|
56565721af
|
Fixed ejecting a DVD while it is being replayed
|
2001-11-04 10:47:37 +01:00 |
|
Klaus Schmidinger
|
57bd015bcb
|
Fixed handling the repeat function in the channel display (cont'd, up/down didn't work with repeat function)
|
2001-10-28 17:06:34 +01:00 |
|
Klaus Schmidinger
|
1cba487e56
|
Implemented stopping a recording on the primary interface
|
2001-10-28 16:32:34 +01:00 |
|
Klaus Schmidinger
|
fee4982077
|
Avoiding multiple EPG entries for the same event
|
2001-10-28 13:53:44 +01:00 |
|
Klaus Schmidinger
|
d64416b922
|
Fixed closing the progress display with the 'Back' key when in trick mode and Setup.ShowReplayMode is enabled (cont'd)
|
2001-10-28 10:21:01 +01:00 |
|
Klaus Schmidinger
|
8690654eaf
|
Fixed handling the repeat function in the channel display
|
2001-10-27 13:48:20 +02:00 |
|
Klaus Schmidinger
|
7e6c2d47e0
|
Fixed a crash when pressing the '2' button while replaying a DVD
|
2001-10-27 12:04:36 +02:00 |
|
Klaus Schmidinger
|
02b5a40539
|
Fixed closing the progress display with the 'Back' key when in trick mode and Setup.ShowReplayMode is enabled
|
2001-10-27 10:23:09 +02:00 |
|
Klaus Schmidinger
|
a7136cf518
|
Pressing the 'Back' button while replaying a DVD now leads to the DVD menu
|
2001-10-21 14:29:03 +02:00 |
|
Klaus Schmidinger
|
e3c09115fe
|
The menu timeout now also works when pressing the 'Back' button during replay to enter the 'Recordings' menu
|
2001-10-20 11:23:27 +02:00 |
|
Klaus Schmidinger
|
312764a7ab
|
Fixed a bug in the replay mode display when pressing the Green or Yellow button while in trick mode
|
2001-10-20 09:06:09 +02:00 |
|
Klaus Schmidinger
|
cc761811ce
|
New setup parameter SplitEditedFiles
|
2001-09-30 11:31:43 +02:00 |
|
Klaus Schmidinger
|
f412897373
|
Calling the '-r' program after editing, too
|
2001-09-23 14:02:11 +02:00 |
|
Klaus Schmidinger
|
9f1046221d
|
New command line option '-r'
|
2001-09-22 14:23:55 +02:00 |
|
Klaus Schmidinger
|
bf8948498d
|
No more unnecessary display of 'normal play mode'
|
2001-09-21 16:24:06 +02:00 |
|
Klaus Schmidinger
|
d8aef25cbc
|
Pressing 'Ok' while the mode display is on brings up the progress display
|
2001-09-21 16:18:51 +02:00 |
|
Klaus Schmidinger
|
a77360a1b6
|
Mode display is shown after progress display is closed
|
2001-09-21 16:07:22 +02:00 |
|
Klaus Schmidinger
|
7fc8b39f43
|
Fixed timeout when pressing '0' to set an editing mark while the progress display is not shown
|
2001-09-21 16:01:45 +02:00 |
|
Klaus Schmidinger
|
9309c176e9
|
No more replay mode display when pressing the 'Green' or 'Yellow' button
|
2001-09-21 15:07:38 +02:00 |
|
Klaus Schmidinger
|
da75e89a0b
|
Fixed going into 'Jump' mode while the replay mode display is active
|
2001-09-15 10:36:31 +02:00 |
|
Klaus Schmidinger
|
1a2c3e1b84
|
Combined displaying time search and replay mode
|
2001-09-14 15:10:12 +02:00 |
|
Klaus Schmidinger
|
5513529419
|
Implemented replay mode display
|
2001-09-14 14:06:43 +02:00 |
|
Klaus Schmidinger
|
de45b51473
|
Implemented 'Multi Speed Mode'
|
2001-09-09 12:52:41 +02:00 |
|
Klaus Schmidinger
|
9d509c37e7
|
Switching through channel groups now starts at current channel's group
|
2001-09-08 14:39:09 +02:00 |
|
Klaus Schmidinger
|
0f87ff86d0
|
Removed EPG fix from cMenuEvent (data is fixed in eit.c)
|
2001-09-02 15:27:54 +02:00 |
|
Klaus Schmidinger
|
22ccf22f6f
|
Using subtitle for repeating timers; taking summary at recording time
|
2001-09-02 15:21:54 +02:00 |
|
Klaus Schmidinger
|
0d75710545
|
Using '~' in recording filename
|
2001-09-02 10:28:20 +02:00 |
|
Klaus Schmidinger
|
4aee497101
|
New setup parameter OSDMessageTime
|
2001-09-01 15:23:27 +02:00 |
|
Klaus Schmidinger
|
5a5fc72814
|
Stopping finished timer recordings before starting new ones
|
2001-09-01 15:04:14 +02:00 |
|
Klaus Schmidinger
|
a8f8de9dc9
|
Implemented automatic shutdown
|
2001-09-01 09:04:37 +02:00 |
|
Klaus Schmidinger
|
6f68910828
|
Sorting timers in the 'Timers' menu
|
2001-08-26 14:17:20 +02:00 |
|
Klaus Schmidinger
|
7092907ccd
|
Timers that are currently recording are now marked with '#'
|
2001-08-26 12:19:23 +02:00 |
|
Klaus Schmidinger
|
0525d1bb78
|
New Setup parameter MaxVideoFileSize
|
2001-08-25 13:52:38 +02:00 |
|
Klaus Schmidinger
|
14d3933d91
|
The menus and the channel display now show the current date and time
|
2001-08-25 13:27:26 +02:00 |
|
Klaus Schmidinger
|
a706fb8643
|
Getting the event info for the current recording
|
2001-08-19 14:45:31 +02:00 |
|
Klaus Schmidinger
|
e994e3a4fe
|
Implemented EPG bugfixing
|
2001-08-17 13:19:10 +02:00 |
|
Klaus Schmidinger
|
0ac6edbfc6
|
Removed hotkeys from 'Cancel...' options
|
2001-08-12 12:42:37 +02:00 |
|
Klaus Schmidinger
|
f7fff8b7be
|
If there is no free DVB device to record, the log message will now be given only once
|
2001-08-11 15:48:54 +02:00 |
|
Klaus Schmidinger
|
0b73f060d0
|
Fixed displaying editing marks when toggling a mark in 'pause' mode
|
2001-08-11 15:08:14 +02:00 |
|
Klaus Schmidinger
|
8e7c06006f
|
Implemented 'Jump' function in replay mode
|
2001-08-11 14:30:21 +02:00 |
|
Klaus Schmidinger
|
cf15f276f9
|
Changed the default value for the 'DiSEqC' setup parameter to 'off'
|
2001-08-11 08:44:48 +02:00 |
|
Klaus Schmidinger
|
1c12948b7e
|
Changed the 'Eject DVD' button text to a simple 'Eject'
|
2001-08-10 15:38:59 +02:00 |
|
Klaus Schmidinger
|
232f410569
|
Fixed handling DVB card indexes when using only one card in a multi-card system
|
2001-08-10 15:18:07 +02:00 |
|
Klaus Schmidinger
|
92d0bb8fcc
|
Suppressing replay progress display when replaying a DVD
|
2001-08-07 16:39:18 +02:00 |
|
Klaus Schmidinger
|
c19ad04a21
|
DVD support is now optional
|
2001-08-06 16:19:20 +02:00 |
|
Klaus Schmidinger
|
57692504cd
|
Improved DVD handling
|
2001-08-05 15:11:35 +02:00 |
|
Klaus Schmidinger
|
8c1fc6560d
|
Removed hotkeys from 'Stop...' options
|
2001-08-05 12:47:14 +02:00 |
|
Klaus Schmidinger
|
c2ed9b5daf
|
New ringbuffer for frames
|
2001-08-05 12:23:24 +02:00 |
|
Klaus Schmidinger
|
614113cdcb
|
Fixed replay progress display in case replay is paused while watching an ongoing recording; initial display comes up in one piece
|
2001-08-04 08:08:44 +02:00 |
|
Klaus Schmidinger
|
bff17fb1d0
|
Added support for replaying DVDs
|
2001-08-03 14:18:08 +02:00 |
|
Klaus Schmidinger
|
1962940c39
|
Modified the display of the channel group separators
|
2001-07-31 15:32:02 +02:00 |
|
Klaus Schmidinger
|
5d415c08d0
|
Fixed display with DEBUG_OSD
|
2001-07-28 16:32:40 +02:00 |
|
Klaus Schmidinger
|
6585e5ede6
|
Showing progress display when setting editing mark
|
2001-07-28 14:06:36 +02:00 |
|
Klaus Schmidinger
|
dd3c8591cd
|
When entering time values the digits that still have to be entered are now shown as '-'
|
2001-07-28 13:48:52 +02:00 |
|
Klaus Schmidinger
|
80d491ec45
|
Avoiding unnecessary code execution in the replay progress display
|
2001-07-28 13:16:23 +02:00 |
|
Klaus Schmidinger
|
47b859c156
|
DiSEqC support can now be generally enabled/disabled
|
2001-07-27 13:45:55 +02:00 |
|
Klaus Schmidinger
|
d008680ad7
|
Made the width and height of the OSD configurable
|
2001-07-27 11:51:42 +02:00 |
|
Klaus Schmidinger
|
81919a6647
|
Made the position of the channel display configurable
|
2001-07-27 10:59:50 +02:00 |
|
Klaus Schmidinger
|
697b389872
|
Increased the upper limit for the symbol rate to 30000
|
2001-07-27 10:28:55 +02:00 |
|
Klaus Schmidinger
|
9323eea670
|
Fixed handling group separator at beginning of 'channels.conf'
|
2001-07-22 15:17:51 +02:00 |
|
Klaus Schmidinger
|
693033f390
|
Displaying the frame counter in the replay progress display only when editing a mark
|
2001-07-22 13:46:07 +02:00 |
|
Klaus Schmidinger
|
c14d8d1da1
|
Larger OSD with 2bpp windows; Channel display at bottom
|
2001-07-22 12:33:45 +02:00 |
|
Klaus Schmidinger
|
a62790ed09
|
Fixed handling of 'Green' button in 'Schedules' menu if channel as a second audio PID
|
2001-07-12 14:58:48 +02:00 |
|
Klaus Schmidinger
|
145d376ec1
|
Displaying '-' when directly switching channels; increased timeout for direct channel switching
|
2001-07-12 14:19:43 +02:00 |
|
Klaus Schmidinger
|
d67fb2ce55
|
Added Dolby Digital recording/replay
|
2001-06-24 17:42:19 +02:00 |
|
Klaus Schmidinger
|
d3f255e79e
|
Setup parameter for VideoFormat
|
2001-06-16 14:31:14 +02:00 |
|
Klaus Schmidinger
|
9de548ee59
|
Recording both audio tracks
|
2001-06-14 15:57:30 +02:00 |
|
Klaus Schmidinger
|
a9b2afd28b
|
Support for two audio channels
|
2001-06-03 13:07:20 +02:00 |
|
Klaus Schmidinger
|
c40e4eb96e
|
Converted to the new API plus several small enhancements
|
2001-06-02 10:47:40 +02:00 |
|
Klaus Schmidinger
|
191fb910bf
|
Fixed a segfault in the Schedule menu in case there is no EPG information
|
2001-03-18 10:16:56 +01:00 |
|
Klaus Schmidinger
|
4398a6942f
|
Fixed internationalization of some Main menu texts
|
2001-03-04 11:42:20 +01:00 |
|
Klaus Schmidinger
|
ebc6dccee3
|
Explicitly setting timer's 'active' field to '1' after user changes
|
2001-02-24 15:05:07 +01:00 |
|
Klaus Schmidinger
|
edacac5f91
|
Implemented PrimaryLimit setup parameter
|
2001-02-24 14:03:39 +01:00 |
|
Klaus Schmidinger
|
3586013b8f
|
New SVDRP command MESG; SVDRP can reuse port; SVDRP timeout
|
2001-02-18 14:18:13 +01:00 |
|
Klaus Schmidinger
|
535e755278
|
Implemented 'Rewind' in the 'Recordings' menu
|
2001-02-11 11:04:41 +01:00 |
|
Klaus Schmidinger
|
7a92a25954
|
'Now', 'Next' and 'Schedule' menus remember the current channel
|
2001-02-10 15:37:21 +01:00 |
|
Klaus Schmidinger
|
1c81b279ee
|
Automatically removing deleted recordings after a while
|
2001-02-04 12:36:32 +01:00 |
|
Klaus Schmidinger
|
d303632efe
|
Implemented TT PID
|
2001-02-03 16:28:03 +01:00 |
|
Klaus Schmidinger
|
4041359317
|
Implemented page up/down with 'Left'/'Right' (cont'd)
|
2001-02-03 15:32:47 +01:00 |
|
Klaus Schmidinger
|
7f6a2a7a0c
|
Implemented hotkeys for Main and Commands menu
|
2001-02-03 15:28:49 +01:00 |
|
Klaus Schmidinger
|
caa96c00ea
|
Implemented page up/down with 'Left'/'Right'
|
2001-02-03 14:35:28 +01:00 |
|
Klaus Schmidinger
|
ba2c25d183
|
Fixed displaying channels and recording status in the RCU's LED display when a recording is interrupted due to higher priority
|
2001-01-13 13:08:43 +01:00 |
|
Klaus Schmidinger
|
7c79f61dd5
|
Adapted frame detection to driver 0.8+
|
2001-01-07 17:00:50 +01:00 |
|
Klaus Schmidinger
|
4e354bc9a0
|
Implemented 'on disk editing'
|
2000-12-28 12:57:16 +01:00 |
|
Klaus Schmidinger
|
4cd7c32425
|
Moved progress display to menu.c
|
2000-12-09 11:13:00 +01:00 |
|
Klaus Schmidinger
|
6b0658a977
|
Switched to PES recording
|
2000-12-08 16:23:32 +01:00 |
|
Klaus Schmidinger
|
79a353c8b9
|
Fixed 'Switch' in the now/next menu
|
2000-11-26 16:18:52 +01:00 |
|
Klaus Schmidinger
|
02c5106555
|
Fixed unwanted reaction on the 'Green' and 'Yellow' button in the 'Event' display
|
2000-11-18 16:31:48 +01:00 |
|
Klaus Schmidinger
|
ca42f7c8f1
|
Fixed font for system commands
|
2000-11-18 15:46:00 +01:00 |
|
Klaus Schmidinger
|
1a5ca67f57
|
Shifting 'Subtitle' info into 'ExtendedDescription' if necessary
|
2000-11-18 14:13:26 +01:00 |
|
Klaus Schmidinger
|
6439a8e169
|
All cards write EIT info into the same data structure; free cards scan for EIT info
|
2000-11-18 13:57:32 +01:00 |
|
Klaus Schmidinger
|
5e272f9065
|
The 'Schedule' button now shows the schedule of the current channel in the 'Now/Next' menu
|
2000-11-12 16:48:50 +01:00 |
|
Klaus Schmidinger
|
5b65773ec8
|
Using timer priority to interrupt lower priority timer recording
|
2000-11-12 14:06:53 +01:00 |
|
Klaus Schmidinger
|
54a2e99c7b
|
Implemented 'Commands' menu
|
2000-11-11 16:38:41 +01:00 |
|
Klaus Schmidinger
|
9c499caf87
|
Avoiding multiple definitions of the same timer in the 'Schedule' menu
|
2000-11-11 12:55:10 +01:00 |
|
Klaus Schmidinger
|
b668b2d013
|
Implemented internationalization
|
2000-11-11 10:39:27 +01:00 |
|
Klaus Schmidinger
|
cda43a8613
|
Made 'SetSystemTime' boolean in 'Setup' menu
|
2000-11-05 18:42:05 +01:00 |
|
Klaus Schmidinger
|
eefbcf5216
|
Current channel is now device specific
|
2000-11-05 18:39:17 +01:00 |
|
Klaus Schmidinger
|
ea0bd668c8
|
Date and time in the title of an event info page are now always right adjusted
|
2000-11-05 13:04:23 +01:00 |
|
Klaus Schmidinger
|
24c17aa02f
|
Fixed handling empty 'Schedule' menu
|
2000-11-01 15:50:00 +01:00 |
|
Klaus Schmidinger
|
fb096c680f
|
Moved 'DisplayChannel' to menu.c; Yellow and Green function temporarily disabled
|
2000-11-01 15:41:33 +01:00 |
|
Klaus Schmidinger
|
25f085cc26
|
Improved Schedules menus
|
2000-11-01 11:45:05 +01:00 |
|
Klaus Schmidinger
|
e6999e9b3a
|
Implemented 'Schedules' menu
|
2000-10-29 13:17:22 +01:00 |
|
Klaus Schmidinger
|
212468e2e0
|
LNB frequencies can now be configured
|
2000-10-08 16:18:23 +02:00 |
|
Klaus Schmidinger
|
724a596cf2
|
'Blue' button in main menu has 'Resume'
|
2000-10-08 15:41:30 +02:00 |
|
Klaus Schmidinger
|
9faf7a51e5
|
Pressing 'Back' in replay mode brings up 'Recordings' menu
|
2000-10-08 15:08:26 +02:00 |
|
Klaus Schmidinger
|
a1a52fe11f
|
Implemented MarkInstantRecord setup option
|
2000-10-08 13:08:13 +02:00 |
|
Klaus Schmidinger
|
19f9f9cfce
|
Fixed daemon mode (RcIo and Interface no longer static)
|
2000-10-08 12:24:30 +02:00 |
|
Klaus Schmidinger
|
605d8df72a
|
Explicit Repeat/Release handling for remote control
|
2000-10-08 11:39:11 +02:00 |
|
Klaus Schmidinger
|
48613fdb14
|
Implemented toggling between current and previous channel
|
2000-10-03 14:06:44 +02:00 |
|
Klaus Schmidinger
|
71c17e5064
|
Implemented 'new recording' indicator
|
2000-10-03 12:44:15 +02:00 |
|
Klaus Schmidinger
|
e4f7e025e5
|
No longer displaying the year in the 'Recordings' menu
|
2000-10-03 11:39:04 +02:00 |
|
Klaus Schmidinger
|
72642d67a1
|
Added missing 'const'
|
2000-09-11 21:13:46 +02:00 |
|
Klaus Schmidinger
|
380b28cec8
|
Removed 'preferred' field to not break channels.conf format in 0.63 release
|
2000-09-10 15:07:15 +02:00 |
|
Klaus Schmidinger
|
bec3064590
|
Direct channel select displays digits and name on OSD
|
2000-09-10 14:56:18 +02:00 |
|
Klaus Schmidinger
|
a334a2df33
|
Added a 'Setup' menu
|
2000-09-10 10:51:58 +02:00 |
|
Klaus Schmidinger
|
c00d4ea326
|
Implemented 'channel grouping'
|
2000-09-09 14:57:43 +02:00 |
|
Klaus Schmidinger
|
3e366d1ec4
|
No more upper limit for the value of 'Pnr'
|
2000-08-06 07:05:19 +02:00 |
|