From f3252b4ccaf67f0838f65b10961f2ace050f464e Mon Sep 17 00:00:00 2001 From: sletz Date: Fri, 4 Mar 2011 12:45:19 +0000 Subject: [PATCH] Remove unneeded include. git-svn-id: http://subversion.jackaudio.org/jack/jack2/trunk/jackmp@4148 0c269be4-1314-0410-8aa9-9f06e86f4224 --- common/JackChannel.h | 9 ++++----- common/JackClient.h | 1 - common/JackFrameTimer.h | 22 +++++++++++----------- common/JackPort.h | 6 +++--- common/JackPortType.h | 3 +-- 5 files changed, 19 insertions(+), 22 deletions(-) diff --git a/common/JackChannel.h b/common/JackChannel.h index 40cfd264..cbea58e4 100644 --- a/common/JackChannel.h +++ b/common/JackChannel.h @@ -12,7 +12,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software +along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef __JackChannel__ #define __JackChannel__ -#include "types.h" #include "session.h" namespace Jack @@ -126,7 +125,7 @@ class JackClientChannelInterface virtual void InternalClientUnload(int refnum, int int_ref, int* status, int* result) {} - + virtual void SessionNotify(int refnum, const char* target, jack_session_event_type_t type, const char *path, jack_session_command_t **result) {} @@ -143,8 +142,8 @@ class JackClientChannelInterface {} virtual bool IsChannelThread() - { - return false; + { + return false; } }; diff --git a/common/JackClient.h b/common/JackClient.h index 7b253661..c5a3b9aa 100644 --- a/common/JackClient.h +++ b/common/JackClient.h @@ -27,7 +27,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #include "JackSynchro.h" #include "JackPlatformPlug.h" #include "JackChannel.h" -#include "types.h" #include "session.h" #include "varargs.h" #include diff --git a/common/JackFrameTimer.h b/common/JackFrameTimer.h index aca70add..afac2f78 100644 --- a/common/JackFrameTimer.h +++ b/common/JackFrameTimer.h @@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software +along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -36,9 +36,9 @@ class SERVER_EXPORT JackTimer { friend class JackFrameTimer; - - private: - + + private: + jack_nframes_t fFrames; jack_time_t fCurrentWakeup; jack_time_t fCurrentCallback; @@ -47,21 +47,21 @@ class SERVER_EXPORT JackTimer float fFilterCoefficient; /* set once, never altered */ bool fInitialized; - public: - + public: + JackTimer(); ~JackTimer() {} - + jack_nframes_t Time2Frames(jack_time_t time, jack_nframes_t buffer_size); jack_time_t Frames2Time(jack_nframes_t frames, jack_nframes_t buffer_size); jack_nframes_t FramesSinceCycleStart(jack_time_t cur_time, jack_nframes_t frames_rate); - + jack_nframes_t CurFrame() { return fFrames; } - + jack_time_t CurTime() { return fCurrentWakeup; @@ -75,7 +75,7 @@ class SERVER_EXPORT JackTimer class SERVER_EXPORT JackFrameTimer : public JackAtomicState { - + private: bool fFirstWakeUp; @@ -93,7 +93,7 @@ class SERVER_EXPORT JackFrameTimer : public JackAtomicState void ResetFrameTime(jack_nframes_t frames_rate, jack_time_t callback_usecs, jack_time_t period_usecs); void IncFrameTime(jack_nframes_t buffer_size, jack_time_t callback_usecs, jack_time_t period_usecs); void ReadFrameTime(JackTimer* timer); - + } POST_PACKED_STRUCTURE; diff --git a/common/JackPort.h b/common/JackPort.h index 45f90733..ed54d65d 100644 --- a/common/JackPort.h +++ b/common/JackPort.h @@ -13,7 +13,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software +along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -56,7 +56,7 @@ class SERVER_EXPORT JackPort bool fInUse; jack_port_id_t fTied; // Locally tied source port float fBuffer[BUFFER_SIZE_MAX + 4]; - + bool IsUsed() const { return fInUse; @@ -105,7 +105,7 @@ class SERVER_EXPORT JackPort } int GetRefNum() const; - + } POST_PACKED_STRUCTURE; } // end of namespace diff --git a/common/JackPortType.h b/common/JackPortType.h index 616e0ae9..dd573365 100644 --- a/common/JackPortType.h +++ b/common/JackPortType.h @@ -12,7 +12,7 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General Public License for more details. You should have received a copy of the GNU Lesser General Public License -along with this program; if not, write to the Free Software +along with this program; if not, write to the Free Software Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ @@ -20,7 +20,6 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. #ifndef __JackPortType__ #define __JackPortType__ -#include "types.h" #include "JackConstants.h" #include