Same file names in multiple directories with similar content

[hoene]

Hello Ingemar,

in multiple directories, we find files with the same filename. Sometimes, they have same content, sometimes, the content differs (see below).

This version of the files shall we use?

With best regards,

Christian

scream/code/gscream/gst-gscreamrx/gst-plugin/src$ diff ScreamRx.cpp ../../../../ScreamRx.cpp 
284c284
<     buf[1] = 205;
---
>     buf[1] = 207;


scream/code/gscream/gst-gscreamrx/gst-plugin/src$ diff -w ScreamRx.h ../../../../ScreamRx.h
30c30
< extern "C" {
---
> 
144c144
< }
---
> 


scream/code/gscream/gst-gscreamrx/gst-plugin/src$ diff -w ScreamTx.h ../../../../ScreamTx.h
6a7
> extern "C" {
50a52,53
> // Max video rampup scale as fraction of the current target bitrate
> static const float kRampUpScale = 0.2f; 
141a145
> 		float rampUpScale = kRampUpScale,
334a339
> 			float rampUpScale,
357a363
> 		float rampUpScale;
659a666
> }



scream/code/gscream/gst-gscreamrx/gst-plugin/src$ diff ScreamTx0.h ScreamTx.h 
7d6
< extern "C" {
661d659
< }


diff -w RtpQueue.cpp ../../../../RtpQueue.cpp 
.... many differences ....

diff -w RtpQueue.h ../../../../RtpQueue.h
.... many differences ....

scream/code/gscream/gst-gscreamtx/gst-plugin/src$ diff -w ScreamRx.cpp ../../../../ScreamRx.cpp 
284c284
<     buf[1] = 205;
---
>     buf[1] = 207;

[mirabilos]

From what I can tell from recent activity, the bw-test-tool files are the latest, but I posed this question as well.

I symlinked the other files (those in gscream to those in top-level code) already, except for RtpQueue, which does seem to have three only very slightly differing implementations. (The diffs between the three of them also seem to hint that bw-test-tool is supposedly the current master copy.)

[mirabilos]

@IngJohEricsson merged bw-test-tool into top-level, and I had already symlinked¹ gscream, so the file duplication is now mostly gone (modulo the GStreamer-caused delta in RtpQueue), so I’d close this.

① replaced by #include though because symlinks seem to not work with some git implementations