merge r2107 from trunk

git-svn-id: file:///home/lennart/svn/public/pulseaudio/branches/prepare-0.9.10@2161 fefdeb5f-60dc-0310-8127-8f9354f1896f
This commit is contained in:
Lennart Poettering 2008-03-27 23:31:09 +00:00
parent e704fd358c
commit ec39786f2f

View file

@ -596,13 +596,13 @@ int main(int argc, char *argv[]) {
int tty_fd; int tty_fd;
if (pa_stdio_acquire() < 0) { if (pa_stdio_acquire() < 0) {
pa_log("failed to acquire stdio."); pa_log("Failed to acquire stdio.");
goto finish; goto finish;
} }
#ifdef HAVE_FORK #ifdef HAVE_FORK
if (pipe(daemon_pipe) < 0) { if (pipe(daemon_pipe) < 0) {
pa_log("failed to create pipe."); pa_log("Failed to create pipe.");
goto finish; goto finish;
} }
@ -704,6 +704,7 @@ int main(int argc, char *argv[]) {
signal(SIGPIPE, SIG_IGN); signal(SIGPIPE, SIG_IGN);
#endif #endif
pa_log_info("This is PulseAudio " PACKAGE_VERSION);
pa_log_info("Page size is %lu bytes", (unsigned long) PA_PAGE_SIZE); pa_log_info("Page size is %lu bytes", (unsigned long) PA_PAGE_SIZE);
if (pa_rtclock_hrtimer()) if (pa_rtclock_hrtimer())