Miko/libremetaverse
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Rename LibreMetaverse.Voice to LibreMetaverse.Voice.Vivox in prep for LibreMetaverse.Voice.WebRtc

Browse Source
This commit is contained in:
Cinder Roxley
2024-10-31 08:13:31 -05:00
parent d004c4f841
commit 162fb8449e
17 changed files with 22 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
LibreMetaverse.Voice/LibreMetaverse.Voice.csproj → LibreMetaverse.Voice.Vivox/LibreMetaverse.Voice.Vivox.csproj
View File

@@ -1,7 +1,6 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>LibreMetaverse.Voice</AssemblyName>
<PackageId>LibreMetaverse.Voice</PackageId>
<PackageId>LibreMetaverse.Voice.Vivox</PackageId>
<Description>Library interface for Vivox voice client</Description>
<OutputType>Library</OutputType>
<RootNamespace>LibreMetaverse</RootNamespace>

2
LibreMetaverse.Voice/TCPPipe.cs → LibreMetaverse.Voice.Vivox/TCPPipe.cs
View File

@@ -30,7 +30,7 @@ using System.Diagnostics;
using System.Net;
using System.Net.Sockets;
namespace LibreMetaverse.Voice
namespace LibreMetaverse.Voice.Vivox
{
public class TCPPipe
{

2
LibreMetaverse.Voice/VoiceAccount.cs → LibreMetaverse.Voice.Vivox/VoiceAccount.cs
View File

@@ -27,7 +27,7 @@
using System.Text;
namespace LibreMetaverse.Voice
namespace LibreMetaverse.Voice.Vivox
{
public partial class VoiceGateway
{

2
LibreMetaverse.Voice/VoiceAux.cs → LibreMetaverse.Voice.Vivox/VoiceAux.cs
View File

@@ -25,7 +25,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
namespace LibreMetaverse.Voice
namespace LibreMetaverse.Voice.Vivox
{
public partial class VoiceGateway
{

2
LibreMetaverse.Voice/VoiceConnector.cs → LibreMetaverse.Voice.Vivox/VoiceConnector.cs
View File

@@ -27,7 +27,7 @@
using System.Text;
namespace LibreMetaverse.Voice
namespace LibreMetaverse.Voice.Vivox
{
public partial class VoiceGateway
{

2
LibreMetaverse.Voice/VoiceControl.cs → LibreMetaverse.Voice.Vivox/VoiceControl.cs
View File

@@ -36,7 +36,7 @@ using OpenMetaverse.StructuredData;
using System.Net.Http;
using System.Threading.Tasks;
namespace LibreMetaverse.Voice
namespace LibreMetaverse.Voice.Vivox
{
public partial class VoiceGateway : IDisposable
{

2
LibreMetaverse.Voice/VoiceDefinitions.cs → LibreMetaverse.Voice.Vivox/VoiceDefinitions.cs
View File

@@ -30,7 +30,7 @@ using System.Collections.Generic;
using System.Xml.Serialization;
using OpenMetaverse;
namespace LibreMetaverse.Voice
namespace LibreMetaverse.Voice.Vivox
{
public partial class VoiceGateway
{

2
LibreMetaverse.Voice/VoiceGateway.cs → LibreMetaverse.Voice.Vivox/VoiceGateway.cs
View File

@@ -34,7 +34,7 @@ using System.Threading;
using System.Text;
using OpenMetaverse;
namespace LibreMetaverse.Voice
namespace LibreMetaverse.Voice.Vivox
{
public partial class VoiceGateway
{

4
LibreMetaverse.Voice/VoiceManager.cs → LibreMetaverse.Voice.Vivox/VoiceManager.cs
View File

@@ -40,7 +40,7 @@ using OpenMetaverse.Messages.Linden;
using System.Net.Http;
using System.Threading.Tasks;
namespace LibreMetaverse.Voice
namespace LibreMetaverse.Voice.Vivox
{
public enum VoiceStatus
{
@@ -187,7 +187,7 @@ namespace LibreMetaverse.Voice
{
if (!_enabled) return false;
_daemonPipe = new Voice.TCPPipe();
_daemonPipe = new TCPPipe();
_daemonPipe.OnDisconnected += _DaemonPipe_OnDisconnected;
_daemonPipe.OnReceiveLine += _DaemonPipe_OnReceiveLine;

2
LibreMetaverse.Voice/VoiceManagerBlocking.cs → LibreMetaverse.Voice.Vivox/VoiceManagerBlocking.cs
View File

@@ -28,7 +28,7 @@
using System.Collections.Generic;
using System.Threading;
namespace LibreMetaverse.Voice
namespace LibreMetaverse.Voice.Vivox
{
public partial class VoiceManager
{

2
LibreMetaverse.Voice/VoiceParticipant.cs → LibreMetaverse.Voice.Vivox/VoiceParticipant.cs
View File

@@ -30,7 +30,7 @@ using System.Text;
using System.Text.RegularExpressions;
using OpenMetaverse;
namespace LibreMetaverse.Voice
namespace LibreMetaverse.Voice.Vivox
{
public class VoiceParticipant
{

2
LibreMetaverse.Voice/VoiceSession.cs → LibreMetaverse.Voice.Vivox/VoiceSession.cs
View File

@@ -29,7 +29,7 @@ using System.Collections.Generic;
using System.Globalization;
using System.Text;
namespace LibreMetaverse.Voice
namespace LibreMetaverse.Voice.Vivox
{
/// <summary>
/// Represents a single Voice Session to the Vivox service.

4
LibreMetaverse.sln
View File

@@ -27,7 +27,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "PacketDump", "Programs\exam
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "TestClient", "Programs\examples\TestClient\TestClient.csproj", "{9F71FDB3-0000-0000-0000-000000000000}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VoiceTest", "Programs\VoiceTest\VoiceTest.csproj", "{EE4EA934-0000-0000-0000-000000000000}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "VivoxTest", "Programs\VivoxTest\VivoxTest.csproj", "{EE4EA934-0000-0000-0000-000000000000}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.PrimMesher", "PrimMesher\LibreMetaverse.PrimMesher.csproj", "{2E2B643F-F18B-4791-BA4B-6E82D0E794B6}"
EndProject
@@ -43,7 +43,7 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.LslTools", "LibreMetaverse.LslTools\LibreMetaverse.LslTools.csproj", "{989E5E15-D99B-4CF1-AF64-90C568FC979A}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.Voice", "LibreMetaverse.Voice\LibreMetaverse.Voice.csproj", "{FB07C6DE-F791-4336-B6E2-B32EEAC34792}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "LibreMetaverse.Voice.Vivox", "LibreMetaverse.Voice.Vivox\LibreMetaverse.Voice.Vivox.csproj", "{FB07C6DE-F791-4336-B6E2-B32EEAC34792}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution

5
Programs/VoiceTest/VoiceTest.csproj → Programs/VivoxTest/VivoxTest.csproj
View File

@@ -1,12 +1,13 @@
<Project Sdk="Microsoft.NET.Sdk">
<PropertyGroup>
<AssemblyName>VoiceTest</AssemblyName>
<OutputType>Exe</OutputType>
<GenerateAssemblyInfo>true</GenerateAssemblyInfo>
<OutputPath>..\..\bin\</OutputPath>
<TargetFrameworks>net481;net7.0;net8.0</TargetFrameworks>
<PlatformTarget>AnyCPU</PlatformTarget>
<IsPackable>false</IsPackable>
<PackageId>VivoxTest</PackageId>
<RootNamespace>VoiceTest</RootNamespace>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="System.Net.NameResolution" Version="4.3.0" />
@@ -14,7 +15,7 @@
<ItemGroup>
<ProjectReference Include="..\..\LibreMetaverse\LibreMetaverse.csproj" />
<ProjectReference Include="..\..\LibreMetaverse.Types\LibreMetaverse.Types.csproj" />
<ProjectReference Include="..\..\LibreMetaverse.Voice\LibreMetaverse.Voice.csproj" />
<ProjectReference Include="..\..\LibreMetaverse.Voice.Vivox\LibreMetaverse.Voice.Vivox.csproj" />
</ItemGroup>
<ItemGroup>
<None Include="..\..\LICENSE.txt" Pack="true" PackagePath="\" />

4
Programs/VoiceTest/VoiceTest.cs → Programs/VivoxTest/VoiceTest.cs
View File

@@ -28,7 +28,7 @@ using System;
using System.Collections.Generic;
using System.Threading;
using OpenMetaverse;
using LibreMetaverse.Voice;
using LibreMetaverse.Voice.Vivox;
namespace VoiceTest
{
@@ -62,7 +62,7 @@ namespace VoiceTest
{
if (args.Length < 3)
{
Console.WriteLine("Usage: VoiceTest.exe [firstname] [lastname] [password]");
Console.WriteLine("Usage: VivoxTest.exe [firstname] [lastname] [password]");
return;
}

2
Programs/examples/TestClient/TestClient.cs
View File

@@ -3,7 +3,7 @@ using System.Collections.Generic;
using System.Threading;
using System.Reflection;
using OpenMetaverse.Packets;
using LibreMetaverse.Voice;
using LibreMetaverse.Voice.Vivox;
namespace OpenMetaverse.TestClient
{

2
Programs/examples/TestClient/TestClient.csproj
View File

@@ -13,7 +13,7 @@
<ProjectReference Include="..\..\..\LibreMetaverse\LibreMetaverse.csproj" />
<ProjectReference Include="..\..\..\LibreMetaverse.StructuredData\LibreMetaverse.StructuredData.csproj" />
<ProjectReference Include="..\..\..\LibreMetaverse.Types\LibreMetaverse.Types.csproj" />
<ProjectReference Include="..\..\..\LibreMetaverse.Voice\LibreMetaverse.Voice.csproj" />
<ProjectReference Include="..\..\..\LibreMetaverse.Voice.Vivox\LibreMetaverse.Voice.Vivox.csproj" />
</ItemGroup>
<ItemGroup>
<PackageReference Include="Pfim" Version="0.11.2" />