Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Update new version of pp7 #9

Merged
merged 4 commits into from
Jan 13, 2024
Merged

Update new version of pp7 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
886d596
Update proto buffer decoded content
ioanlucut Jan 13, 2024
1ed4008
Update ts-proto dependency version to 1.165.2.
ioanlucut Jan 13, 2024
de36b81
Add instructions on how to use the `protodump` utility for encoding p…
ioanlucut Jan 13, 2024
ebe79c0
Refactor converterService to check for missing song IDs and throw an …
ioanlucut Jan 13, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,10 @@ convertSongsToPP7FormatLocally({
This repo is doing a reverse engineering from the pro presenter protobuf format to a known format, and then it encodes
back presentation files by using the https://github.com/arkadiyt/protodump utility.

To use that, simply run the following commands:
`git clone https://github.com/arkadiyt/protodump.git`
`go build -o protodump cmd/protodump/main.go`

#### Find proto files from PP7

> Assuming that `protodump` is a sibling of this dir:
Expand All @@ -112,7 +116,7 @@ find /Applications/ProPresenter.app/ -type f -perm +111 -print -exec ../protodum
```unix
cd proto

for f in ./proto/*; do protoc --plugin=../node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./proto --ts_proto_opt=esModuleInterop=true ./$f ; done
for f in ./*; do protoc --plugin=../node_modules/.bin/protoc-gen-ts_proto --ts_proto_out=./ --ts_proto_opt=esModuleInterop=true ./$f ; done
```

#### Decode a single presentation file called `TEMP.pro` to `TS`
Expand Down
30 changes: 21 additions & 9 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@
"p-map": "^4.0.0",
"protobufjs": "^7.2.5",
"recursive-readdir": "^2.2.3",
"ts-proto": "^1.158.0",
"uuid": "^9.0.1"
},
"devDependencies": {
Expand All @@ -40,6 +39,7 @@
"prettier": "^2.8.8",
"ts-jest": "^29.1.1",
"ts-node": "^10.9.1",
"ts-proto": "^1.165.2",
"tslib": "^2.6.2",
"typescript": "5.1.6"
}
Expand Down
37 changes: 30 additions & 7 deletions proto/action.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,17 +6,21 @@ option cc_enable_arenas = true;
option csharp_namespace = "Pro.SerializationInterop.RVProtoData";
option swift_prefix = "RVData_";

import "basicTypes.proto";
import "layers.proto";
import "background.proto";
import "collectionElementType.proto";
import "color.proto";
import "effects.proto";
import "graphicsData.proto";
import "background.proto";
import "presentationSlide.proto";
import "propSlide.proto";
import "timers.proto";
import "input.proto";
import "intRange.proto";
import "layers.proto";
import "messages.proto";
import "propSlide.proto";
import "presentationSlide.proto";
import "stage.proto";
import "input.proto";
import "timers.proto";
import "url.proto";
import "uuid.proto";

message Action {
reserved "social_media";
Expand Down Expand Up @@ -71,6 +75,7 @@ message Action {
}

message MediaType {
reserved 13;
message Image {
}

Expand Down Expand Up @@ -349,6 +354,21 @@ message Action {
.rv.data.CollectionElementType identification = 1;
}

message CaptureType {
message CaptureStart {
.rv.data.CollectionElementType preset_identification = 1;
}

message CaptureStop {
bool shows_alert_before_stopping = 1;
}

oneof CaptureAction {
.rv.data.Action.CaptureType.CaptureStart start = 1;
.rv.data.Action.CaptureType.CaptureStop stop = 2;
}
}

enum ContentDestination {
CONTENT_DESTINATION_GLOBAL = 0;
CONTENT_DESTINATION_ANNOUNCEMENTS = 1;
Expand Down Expand Up @@ -386,6 +406,8 @@ message Action {
ACTION_TYPE_SLIDE_DESTINATION = 22;
ACTION_TYPE_MACRO = 23;
ACTION_TYPE_CLEAR_GROUP = 24;
ACTION_TYPE_CAPTURE = 25;
ACTION_TYPE_LIBRARY_PLAYLIST = 26;
}

.rv.data.UUID uuid = 1;
Expand Down Expand Up @@ -423,6 +445,7 @@ message Action {
.rv.data.Action.MacroType macro = 40;
.rv.data.Action.ClearGroupType clear_group = 41;
.rv.data.Action.TransportControlType transport_control = 42;
.rv.data.Action.CaptureType capture = 43;
}
}

Loading