[asterisk-commits] kpfleming: branch 1.4 r159571 - /branches/1.4/channels/

[SVN commits to the Asterisk project]

Author: kpfleming
Date: Wed Nov 26 14:21:04 2008
New Revision: 159571

URL: http://svn.digium.com/view/asterisk?view=rev&rev=159571
Log:
rename these files so as to avoid conflicts when users update their working copies and have unversioned files already in place

Added:
    branches/1.4/channels/busy_tone.h   (props changed)
      - copied unchanged from r159570, branches/1.4/channels/busy.h
    branches/1.4/channels/ring_tone.h   (props changed)
      - copied unchanged from r159570, branches/1.4/channels/ringtone.h
Removed:
    branches/1.4/channels/busy.h
    branches/1.4/channels/ringtone.h
Modified:
    branches/1.4/channels/Makefile
    branches/1.4/channels/chan_alsa.c
    branches/1.4/channels/chan_oss.c

Modified: branches/1.4/channels/Makefile
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/Makefile?view=diff&rev=159571&r1=159570&r2=159571
==============================================================================
--- branches/1.4/channels/Makefile (original)
+++ branches/1.4/channels/Makefile Wed Nov 26 14:21:04 2008
@@ -94,11 +94,11 @@
 	$(CMD_PREFIX) $(HOST_CC) $(STATIC_BUILD) -o $@ $(HOST_CFLAGS) $(HOST_LDFLAGS) $^ $(LIBS)
 gentone: LIBS+=-lm
 
-busy.h:
-	./gentone busy 480 620
+busy_tone.h:
+	./gentone busy_tone 480 620
 
-ringtone.h:
-	./gentone ringtone 440 480
+ring_tone.h:
+	./gentone ring_tone 440 480
 
 $(if $(filter chan_iax2,$(EMBEDDED_MODS)),modules.link,chan_iax2.so): iax2-parser.o iax2-provision.o
 

Propchange: branches/1.4/channels/busy_tone.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: branches/1.4/channels/busy_tone.h
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: branches/1.4/channels/busy_tone.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: branches/1.4/channels/busy_tone.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: branches/1.4/channels/chan_alsa.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_alsa.c?view=diff&rev=159571&r1=159570&r2=159571
==============================================================================
--- branches/1.4/channels/chan_alsa.c (original)
+++ branches/1.4/channels/chan_alsa.c Wed Nov 26 14:21:04 2008
@@ -63,8 +63,8 @@
 #include "asterisk/abstract_jb.h"
 #include "asterisk/musiconhold.h"
 
-#include "busy.h"
-#include "ringtone.h"
+#include "busy_tone.h"
+#include "ring_tone.h"
 #include "ring10.h"
 #include "answer.h"
 

Modified: branches/1.4/channels/chan_oss.c
URL: http://svn.digium.com/view/asterisk/branches/1.4/channels/chan_oss.c?view=diff&rev=159571&r1=159570&r2=159571
==============================================================================
--- branches/1.4/channels/chan_oss.c (original)
+++ branches/1.4/channels/chan_oss.c Wed Nov 26 14:21:04 2008
@@ -77,8 +77,8 @@
 #include "asterisk/musiconhold.h"
 
 /* ringtones we use */
-#include "busy.h"
-#include "ringtone.h"
+#include "busy_tone.h"
+#include "ring_tone.h"
 #include "ring10.h"
 #include "answer.h"
 

Propchange: branches/1.4/channels/ring_tone.h
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: branches/1.4/channels/ring_tone.h
------------------------------------------------------------------------------
    svn:keywords = Author Date Id Revision

Propchange: branches/1.4/channels/ring_tone.h
------------------------------------------------------------------------------
    svn:mergeinfo = 

Propchange: branches/1.4/channels/ring_tone.h
------------------------------------------------------------------------------
    svn:mime-type = text/plain