[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Commit-gnuradio] r9129 - gnuradio/branches/releases/3.1/gnuradio-core/s
From: |
jcorgan |
Subject: |
[Commit-gnuradio] r9129 - gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime |
Date: |
Fri, 1 Aug 2008 11:54:43 -0600 (MDT) |
Author: jcorgan
Date: 2008-08-01 11:54:41 -0600 (Fri, 01 Aug 2008)
New Revision: 9129
Modified:
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_sync_interpolator.cc
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
Log:
Applied changeset r8835 on trunk to release branch.
Modified:
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_sync_interpolator.cc
===================================================================
---
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_sync_interpolator.cc
2008-08-01 17:43:58 UTC (rev 9128)
+++
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_sync_interpolator.cc
2008-08-01 17:54:41 UTC (rev 9129)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -50,7 +50,7 @@
}
int
-gr_sync_interpolator::fixed_rate_ninput_to_noutout(int ninput_items)
+gr_sync_interpolator::fixed_rate_ninput_to_noutput(int ninput_items)
{
return std::max(0, ninput_items - (int)history() + 1) * interpolation();
}
Modified:
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
===================================================================
---
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
2008-08-01 17:43:58 UTC (rev 9128)
+++
gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime/gr_sync_interpolator.h
2008-08-01 17:54:41 UTC (rev 9129)
@@ -1,6 +1,6 @@
/* -*- c++ -*- */
/*
- * Copyright 2004 Free Software Foundation, Inc.
+ * Copyright 2004,2008 Free Software Foundation, Inc.
*
* This file is part of GNU Radio
*
@@ -60,7 +60,7 @@
// derived classes should override work
- int fixed_rate_ninput_to_noutout(int ninput);
+ int fixed_rate_ninput_to_noutput(int ninput);
int fixed_rate_noutput_to_ninput(int noutput);
};
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Commit-gnuradio] r9129 - gnuradio/branches/releases/3.1/gnuradio-core/src/lib/runtime,
jcorgan <=