aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorvektor <devnull@localhost>2005-03-30 02:42:46 (GMT)
committervektor <devnull@localhost>2005-03-30 02:42:46 (GMT)
commitf24d6cd4b19d55b5ba8385ee799b54abb30c7d1e (patch)
tree9fa82a71316316490c8e794749e7e7b1d2c76349
parent397d90c9b4cad379bec1f94bd44cf012467358d5 (diff)
* tvtime/src/tvtime.c: Stop complaining about /dev/rtc. It just confuses
users and isn't really a problem if you're running a 2.6 kernel. Add RTC information to the debug output so we can find out if necessary. * tvtime/ChangeLog: Note this in the ChangeLog.
-rw-r--r--ChangeLog2
-rw-r--r--src/tvtime.c27
2 files changed, 8 insertions, 21 deletions
diff --git a/ChangeLog b/ChangeLog
index d65cac2..a58eed1 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
1.0RC1 -
+ * vektor: Don't bother complaining about /dev/rtc, we don't really
+ need to use it under Linux 2.6 anyway, and it confuses everyone.
* vektor: Added a config file option to shut off the taglines.
* vektor: Relicensed deinterlacer code written by me under the LGPL.
* vektor: Stop setting the window caption so often. This should be
diff --git a/src/tvtime.c b/src/tvtime.c
index 8e8b4b1..f4b0703 100644
--- a/src/tvtime.c
+++ b/src/tvtime.c
@@ -2152,9 +2152,9 @@ int tvtime_main( rtctimer_t *rtctimer, int read_stdin, int realtime,
/* Print statistics and check for missed frames. */
if( printdebug ) {
int framesize = width * height * 2;
- fprintf( stderr, "tvtime: Stats using '%s' at %dx%d%s.\n",
+ fprintf( stderr, "tvtime: Stats using '%s' at %dx%d%s%s.\n",
(curmethod) ? curmethod->name : "interlaced passthrough",
- width, height, realtime ? " [RT]" : "" );
+ width, height, realtime ? " [RT]" : "", rtctimer ? " [RTC]" : " [no RTC]" );
if( curmethod && curmethod->doscalerbob ) {
framesize = width * height;
}
@@ -2639,32 +2639,17 @@ int main( int argc, char **argv )
realtime = 1;
}
- rtctimer = rtctimer_new( 1 );
- if( !rtctimer ) {
- lfprintf( stderr, _("\n"
- " Enhanced Real Time Clock support in your kernel is necessary for\n"
- " smooth video. We strongly recommend that you load the 'rtc' kernel\n"
- " module before starting tvtime, and make sure that your user has\n"
- " access to the device file (/dev/rtc or /dev/misc/rtc). See our\n"
- " support page at %s for more information.\n\n"), PACKAGE_BUGREPORT );
- } else {
+ rtctimer = rtctimer_new( 0 );
+ if( rtctimer ) {
if( !rtctimer_set_interval( rtctimer, 1024 ) &&
!rtctimer_set_interval( rtctimer, 64 ) ) {
rtctimer_delete( rtctimer );
rtctimer = 0;
} else {
rtctimer_start_clock( rtctimer );
-
if( rtctimer_get_resolution( rtctimer ) < 1024 ) {
- lfprintf( stderr, _("\n"
- " Failed to get 1024 Hz resolution from your RTC device. High\n"
- " resolution access is necessary for video to be smooth. Please\n"
- " run tvtime as root, set tvtime as SUID root, or change the\n"
- " maximum RTC resolution allowed for user processes by running this\n"
- " command as root:\n"
- " sysctl -w dev.rtc.max-user-freq=1024\n"
- " See our support page at %s for more information.\n\n"),
- PACKAGE_BUGREPORT );
+ rtctimer_delete( rtctimer );
+ rtctimer = 0;
}
}
}

Privacy Policy