Beiträge von Grischenkow

vdr:/home/vdruser/.xine# diff -u keymap.ORIGINAL keymap > keymap.diff
vdr:/home/vdruser/.xine# cat keymap.diff 
--- keymap.ORIGINAL	2010-01-22 11:20:36.000000000 +0100
+++ keymap	2010-11-15 10:48:36.000000000 +0100
@@ -5,55 +5,55 @@
 
 # start playback
 Play {
-	key = Return
+	key = VOID
 	modifier = none
 }
 
 # playback pause toggle
 Pause {
-	key = space
+	key = VOID
 	modifier = none
 }
 
 # stop playback
 Stop {
-	key = S
+	key = VOID
 	modifier = none
 }
 
 # take a snapshot
 Snapshot {
-	key = t
+	key = VOID
 	modifier = none
 }
 
 # eject the current medium
 Eject {
-	key = e
+	key = VOID
 	modifier = none
 }
 
 # select and play next MRL in the playlist
 NextMrl {
-	key = Next
+	key = VOID
 	modifier = none
 }
 
 # select and play previous MRL in the playlist
 PriorMrl {
-	key = Prior
+	key = VOID
 	modifier = none
 }
 
 # select and play MRL in the playlist
 SelectMrl {
-	key = Select
+	key = VOID
 	modifier = none
 }
 
 # loop mode toggle
 ToggleLoopMode {
-	key = l
+	key = VOID
 	modifier = none
 }
 
@@ -83,13 +83,13 @@
 
 # set position to -60 seconds in current stream
 SeekRelative-60 {
-	key = Left
+	key = VOID
 	modifier = none
 }
 
 # set position to +60 seconds in current stream
 SeekRelative+60 {
-	key = Right
+	key = VOID
 	modifier = none
 }
 
@@ -197,13 +197,13 @@
 
 # increment playback speed
 SpeedFaster {
-	key = Up
+	key = VOID
 	modifier = none
 }
 
 # decrement playback speed
 SpeedSlower {
-	key = Down
+	key = VOID
 	modifier = none
 }
 
@@ -215,13 +215,13 @@
 
 # increment audio volume
 Volume+ {
-	key = V
+	key = VOID
 	modifier = none
 }
 
 # decrement audio volume
 Volume- {
-	key = v
+	key = VOID
 	modifier = none
 }
 
@@ -251,13 +251,13 @@
 
 # select next audio channel
 AudioChannelNext {
-	key = plus
+	key = VOID
 	modifier = none
 }
 
 # select previous audio channel
 AudioChannelPrior {
-	key = minus
+	key = VOID
 	modifier = none
 }
 
@@ -275,37 +275,37 @@
 
 # select next sub picture (subtitle) channel
 SpuNext {
-	key = period
+	key = VOID
 	modifier = none
 }
 
 # select previous sub picture (subtitle) channel
 SpuPrior {
-	key = comma
+	key = VOID
 	modifier = none
 }
 
 # interlaced mode toggle
 ToggleInterleave {
-	key = i
+	key = VOID
 	modifier = none
 }
 
 # cycle aspect ratio values
 ToggleAspectRatio {
-	key = a
+	key = VOID
 	modifier = none
 }
 
 # reduce the output window size by factor 1.2
 WindowReduce {
-	key = less
+	key = VOID
 	modifier = none
 }
 
 # enlarge the output window size by factor 1.2
 WindowEnlarge {
-	key = greater
+	key = VOID
 	modifier = none
 }
 
@@ -329,13 +329,13 @@
 
 # zoom in
 ZoomIn {
-	key = z
+	key = VOID
 	modifier = none
 }
 
 # zoom out
 ZoomOut {
-	key = Z
+	key = VOID
 	modifier = none
 }
 
@@ -371,7 +371,7 @@
 
 # resize output window to stream size
 Zoom1:1 {
-	key = s
+	key = VOID
 	modifier = none
 }
 
@@ -381,81 +381,75 @@
 	modifier = none
 }
 
-# Xinerama fullscreen toggle
-ToggleXineramaFullscr {
-	key = F
-	modifier = none
-}
-
 # jump to media Menu
 Menu {
-	key = Escape
+	key = m
 	modifier = none
 }
 
 # jump to Title Menu
 TitleMenu {
-	key = F1
+	key = VOID
 	modifier = none
 }
 
 # jump to Root Menu
 RootMenu {
-	key = F2
+	key = VOID
 	modifier = none
 }
 
 # jump to Subpicture Menu
 SubpictureMenu {
-	key = F3
+	key = VOID
 	modifier = none
 }
 
 # jump to Audio Menu
 AudioMenu {
-	key = F4
+	key = VOID
 	modifier = none
 }
 
 # jump to Angle Menu
 AngleMenu {
-	key = F5
+	key = VOID
 	modifier = none
 }
 
 # jump to Part Menu
 PartMenu {
-	key = F6
+	key = VOID
 	modifier = none
 }
 
 # menu navigate up
 EventUp {
-	key = KP_Up
+	key = Up
 	modifier = none
 }
 
 # menu navigate down
 EventDown {
-	key = KP_Down
+	key = Down
 	modifier = none
 }
 
 # menu navigate left
 EventLeft {
-	key = KP_Left
+	key = Left
 	modifier = none
 }
 
 # menu navigate right
 EventRight {
-	key = KP_Right
+	key = Right
 	modifier = none
 }
 
 # menu select
 EventSelect {
-	key = KP_Enter
+	key = Return
 	modifier = none
 }
 
@@ -503,13 +497,13 @@
 
 # visibility toggle of output window
 ToggleWindowVisibility {
-	key = h
+	key = VOID
 	modifier = none
 }
 
 # bordered window toggle of output window
 ToggleWindowBorder {
-	key = b
+	key = VOID
 	modifier = none
 }
 
@@ -581,7 +575,7 @@
 
 # show OSD menu
 OSDMenu {
-	key = O
+	key = VOID
 	modifier = none
 }
 
@@ -617,7 +611,7 @@
 
 # grab pointer toggle
 GrabPointer {
-	key = Insert
+	key = VOID
 	modifier = none
 }
 
@@ -689,7 +683,7 @@
 
 # set position in current stream to numeric percentage
 SetPosition% {
-	key = slash
+	key = VOID
 	modifier = none
 }
 
@@ -707,37 +701,37 @@
 
 # change audio video syncing (delay video)
 AudioVideoDecay+ {
-	key = m
+	key = VOID
 	modifier = none
 }
 
 # change audio video syncing (delay audio)
 AudioVideoDecay- {
-	key = n
+	key = VOID
 	modifier = none
 }
 
 # reset audio video syncing offset
 AudioVideoDecayReset {
-	key = Home
+	key = VOID
 	modifier = none
 }
 
 # change subtitle syncing (delay video)
 SpuVideoDecay+ {
-	key = M
+	key = VOID
 	modifier = none
 }
 
 # change subtitle syncing (delay subtitles)
 SpuVideoDecay- {
-	key = N
+	key = VOID
 	modifier = none
 }
 
 # reset subtitle syncing offset
 SpuVideoDecayReset {
-	key = End
+	key = VOID
 	modifier = none
 }
 
@@ -749,7 +743,7 @@
 
 # switch Monitor to DPMS standby mode
 DPMSStandby {
-	key = d
+	key = VOID
 	modifier = none
 }
 
@@ -839,25 +833,25 @@
 
 # VDR Red button
 VDRButtonRed {
-	key = VOID
+	key = F1
 	modifier = none
 }
 
 # VDR Green button
 VDRButtonGreen {
-	key = VOID
+	key = F2
 	modifier = none
 }
 
 # VDR Yellow button
 VDRButtonYellow {
-	key = VOID
+	key = F3
 	modifier = none
 }
 
 # VDR Blue button
 VDRButtonBlue {
-	key = VOID
+	key = F4
 	modifier = none
 }
 
@@ -905,55 +899,55 @@
 
 # VDR Channel +
 VDRChannelPlus {
-	key = VOID
+	key = Prior
 	modifier = none
 }
 
 # VDR Channel -
 VDRChannelMinus {
-	key = VOID
+	key = Next
 	modifier = none
 }
 
 # VDR Schedule menu
 VDRSchedule {
-	key = VOID
+	key = F5
 	modifier = none
 }
 
 # VDR Channel menu
 VDRChannels {
-	key = VOID
+	key = F6
 	modifier = none
 }
 
 # VDR Timers menu
 VDRTimers {
-	key = VOID
+	key = F7
 	modifier = none
 }
 
 # VDR Recordings menu
 VDRRecordings {
-	key = VOID
+	key = F8
 	modifier = none
 }
 
 # VDR Setup menu
 VDRSetup {
-	key = VOID
+	key = F9
 	modifier = none
 }
 
 # VDR Command menu
 VDRCommands {
-	key = VOID
+	key = F10
 	modifier = none
 }
 
 # VDR Command back
 VDRBack {
-	key = VOID
+	key = BackSpace
 	modifier = none
 }
 
@@ -1013,19 +1007,19 @@
 
 # VDR Volume +
 VDRVolumePlus {
-	key = VOID
+	key = plus
 	modifier = none
 }
 
 # VDR Volume -
 VDRVolumeMinus {
-	key = VOID
+	key = minus
 	modifier = none
 }
 
 # VDR Mute audio
 VDRMute {
-	key = VOID
+	key = space
 	modifier = none
 }
 
@@ -1053,6 +1047,104 @@
 	modifier = none
 }
 
+# enter the number 0
+Alias {
+	entry = Number0
+	key = KP_0
+	modifier = none
+}
+
+# enter the number 1
+Alias {
+	entry = Number1
+	key = KP_1
+	modifier = none
+}
+
+# enter the number 2
+Alias {
+	entry = Number2
+	key = KP_2
+	modifier = none
+}
+
+# enter the number 3
+Alias {
+	entry = Number3
+	key = KP_3
+	modifier = none
+}
+
+# enter the number 4
+Alias {
+	entry = Number4
+	key = KP_4
+	modifier = none
+}
+
+# enter the number 5
+Alias {
+	entry = Number5
+	key = KP_5
+	modifier = none
+}
+
+# enter the number 6
+Alias {
+	entry = Number6
+	key = KP_6
+	modifier = none
+}
+
+# enter the number 7
+Alias {
+	entry = Number7
+	key = KP_7
+	modifier = none
+}
+
+# enter the number 8
+Alias {
+	entry = Number8
+	key = KP_8
+	modifier = none
+}
+
+# enter the number 9
+Alias {
+	entry = Number9
+	key = KP_9
+	modifier = none
+}
+
+# VDR Command back
+Alias {
+	entry = VDRBack
+	key = Escape
+	modifier = none
+}
+
+# VDR Volume +
+Alias {
+	entry = VDRVolumePlus
+	key = KP_Add
+	modifier = none
+}
+
+# VDR Volume -
+Alias {
+	entry = VDRVolumeMinus
+	key = KP_Subtract
+	modifier = none
+}
+
+# menu select
+Alias {
+	entry = EventSelect
+	key = KP_Enter
+	modifier = none
+}
+
 ##
 # End of xine key bindings.
 ##

Dec 28 09:25:19 vdr vdr: [5650] remove deleted recordings thread started (pid=2819, tid=5650)
Dec 28 09:25:19 vdr vdr: [5650] removing recording /var/lib/video.00/Die_Konkurrenten/2010-12-27.22.20.6-0.del
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/Die_Konkurrenten/2010-12-27.22.20.6-0.del/00003.ts
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/Die_Konkurrenten/2010-12-27.22.20.6-0.del/index
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/Die_Konkurrenten/2010-12-27.22.20.6-0.del/00002.ts
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/Die_Konkurrenten/2010-12-27.22.20.6-0.del/marks
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/Die_Konkurrenten/2010-12-27.22.20.6-0.del/00001.ts
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/Die_Konkurrenten/2010-12-27.22.20.6-0.del/info
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/Die_Konkurrenten/2010-12-27.22.20.6-0.del/resume
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/Die_Konkurrenten/2010-12-27.22.20.6-0.del
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/Die_Konkurrenten
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/vdr-burn.Aus_der_Mitte_entspringt_ein_Fluss.t1X9ke/DVDAUTHOR/VIDEO_TS
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/vdr-burn.Aus_der_Mitte_entspringt_ein_Fluss.t1X9ke/DVDAUTHOR/AUDIO_TS
Dec 28 09:25:19 vdr vdr: [5650] removing /var/lib/video.00/vdr-burn.Aus_der_Mitte_entspringt_ein_Fluss.t1X9ke/DVDAUTHOR
Dec 28 09:25:19 vdr vdr: [5650] remove deleted recordings thread ended (pid=2819, tid=5650)

vdr:~/INSTALL/mjpegtools-1.9.0/mplex# cat lpcmstrm_in.cpp.path 
--- lpcmstrm_in.cpp.orig	2010-12-15 09:47:18.000000000 +0100
+++ lpcmstrm_in.cpp	2010-12-15 09:54:47.000000000 +0100
@@ -53,7 +53,7 @@
 
 bool LPCMStream::Probe(IBitStream &bs )
 {
-    char *last_dot = strrchr( bs.StreamName(), '.' );
+    const char *last_dot = strrchr( bs.StreamName(), '.' );
     return 
         last_dot != NULL 
         && strcmp( last_dot+1, "lpcm") == 0;


vdr:~/INSTALL/mjpegtools-1.9.0/mplex#

vdr:~/INSTALL/mjpegtools-1.9.0/mplex# cat multiplexor.cpp.path 
--- multiplexor.cpp.orig	2010-12-14 14:12:32.000000000 +0100
+++ multiplexor.cpp	2010-12-14 14:12:56.000000000 +0100
@@ -1404,7 +1404,7 @@
 
     if( underruns> 0 )
 	{
-		mjpeg_error_exit1( "MUX STATUS: Frame data under-runs detected!" );
+		mjpeg_warn( "MUX STATUS: Frame data under-runs detected!" );
 	}
 	else
 	{


vdr:~/INSTALL/mjpegtools-1.9.0/mplex#